*8566* Remove unnecessary subclassing