Removed cruft

Took out unneccesary classes.