*6902* Remove unnecessary subclass extensions