Remove unused import and unused variables