removed unneccesary classes