Remove some refactoring comments