remove dead / refactored code