cleaned up some classes.  removed obsolete methods