Removed 3 unneccesary classes