*8148* Clean out unnecessary inheritance