Removed many unnecessary classes.