Removed unused imports/classes