drop unused imports
refactor