clean comments and unused use