cleaned up unnecessary classes