removing comments and unused import