Remove some refactoring leftovers