More cleanup:
  - unused imports
  - removed legacy classes