Remove refactoring attempt