Removed unused imports and unused packages