diff --git a/src/main/config/feature.c b/src/main/config/feature.c
index a1ce317e5e..f2e5314972 100644
--- a/src/main/config/feature.c
+++ b/src/main/config/feature.c
@@ -35,39 +35,34 @@ PG_RESET_TEMPLATE(featureConfig_t, featureConfig,
     .enabledFeatures = DEFAULT_FEATURES | DEFAULT_RX_FEATURE | FEATURE_DYNAMIC_FILTER | FEATURE_ANTI_GRAVITY,
 );
 
-void intFeatureSet(uint32_t mask, uint32_t *features)
+void featureSetLocal(const uint32_t mask, uint32_t *features)
 {
     *features |= mask;
 }
 
-void intFeatureClear(uint32_t mask, uint32_t *features)
+void featureClearLocal(const uint32_t mask, uint32_t *features)
 {
     *features &= ~(mask);
 }
 
-void intFeatureClearAll(uint32_t *features)
-{
-    *features = 0;
-}
-
-bool featureConfigured(uint32_t mask)
+bool featureConfigured(const uint32_t mask)
 {
     return featureConfig()->enabledFeatures & mask;
 }
 
-void featureSet(uint32_t mask)
+void featureSet(const uint32_t mask)
 {
-    intFeatureSet(mask, &featureConfigMutable()->enabledFeatures);
+    featureSetLocal(mask, &featureConfigMutable()->enabledFeatures);
 }
 
-void featureClear(uint32_t mask)
+void featureClear(const uint32_t mask)
 {
-    intFeatureClear(mask, &featureConfigMutable()->enabledFeatures);
+    featureClearLocal(mask, &featureConfigMutable()->enabledFeatures);
 }
 
 void featureClearAll(void)
 {
-    intFeatureClearAll(&featureConfigMutable()->enabledFeatures);
+    featureConfigMutable()->enabledFeatures = 0;
 }
 
 uint32_t featureMask(void)
diff --git a/src/main/config/feature.h b/src/main/config/feature.h
index a0d0b16e6a..4d0a91b3e1 100644
--- a/src/main/config/feature.h
+++ b/src/main/config/feature.h
@@ -62,12 +62,11 @@ typedef struct featureConfig_s {
 
 PG_DECLARE(featureConfig_t, featureConfig);
 
-bool featureConfigured(uint32_t mask);
-void featureSet(uint32_t mask);
-void featureClear(uint32_t mask);
+bool featureConfigured(const uint32_t mask);
+void featureSet(const uint32_t mask);
+void featureClear(const uint32_t mask);
 void featureClearAll(void);
 uint32_t featureMask(void);
 
-void intFeatureClearAll(uint32_t *features);
-void intFeatureSet(uint32_t mask, uint32_t *features);
-void intFeatureClear(uint32_t mask, uint32_t *features);
+void featureSetLocal(const uint32_t mask, uint32_t *features);
+void featureClearLocal(const uint32_t mask, uint32_t *features);