remove refactored code