Revert "NewFeatureComp"

This reverts commit fe9bb283a0e5097efba0be779362e1af0430b53a.