Cleaned up unnecessary classes.