UAR-418 -- Removing code from kc custom extended classes that are is not necessary for customizations.