Removed unnecessary classes.