Removed unneeded classes.