Removed old unused classes and unused imports