Removed unneccesary classes.