removed commented code and unused imports (not tested)