Cleaned up some obsolete classes and fixed some header files