Remove some accidentally included work from another branch.