Misc clean up.
Removed obsolete classes.