more refactoring: removing unused imports