Remove refactored code