*8212* Removed unnecessary subclassing