Took out unnneeded classes.