Remove refactored methods