Remove some refactoring stuff