Removed unneccesary classes