clean up unnecessary classes
clean up unnecessary classes