refactoring only: remove unused code/imports