Removed unecessary classes.