class import cleanup