Removed commented code and unused imports