Removing code that isn't supposed to be in this branch.