*8929* Remove unnecessary subclassing