cleanup: removing non-refactored code