clean up of unused import and unused variables