Removed some unnecessary classes.