Remove unneeded feature gate