*8693* Remove unnecessary subclassing