Remove commentated code and unused imports
Marginally improve a comment