Removed several deprecated classes