I added these in an earlier commit in this branch. This commit removes them before the branch is merged.