Cleaned up some code. Removed a bunch of classes.