Removed several superceded classes. Reduced clutter