remove FeaturesAutoContainerSwitch by keeping the 'On' variant