Removing code after refactoring