Removed two old base classes