Deprecated classes and unused imports removed