unused import cleanup, remove dead class