Removed unused, older stuff.  Added some classes.