diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
index 66e16ec2c..bbc59e22c 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
@@ -72,7 +72,6 @@ const struct YamlIdStr enum_Functions[] = {
   {  FUNC_SET_FAILSAFE, "SET_FAILSAFE"  },
   {  FUNC_RANGECHECK, "RANGECHECK"  },
   {  FUNC_BIND, "BIND"  },
-  {  FUNC_FIRST_WITHOUT_ENABLE, "FIRST_WITHOUT_ENABLE"  },
   {  FUNC_PLAY_SOUND, "PLAY_SOUND"  },
   {  FUNC_PLAY_TRACK, "PLAY_TRACK"  },
   {  FUNC_PLAY_VALUE, "PLAY_VALUE"  },
@@ -412,7 +411,6 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_ARRAY("slidersConfig", 1, 4, struct_sliderConfig, nullptr),
   YAML_ARRAY("potsConfig", 2, 4, struct_potConfig, nullptr),
   YAML_UNSIGNED( "backlightColor", 8 ),
-  YAML_UNSIGNED( "switchUnlockStates", 16 ),
   YAML_ARRAY("sticksConfig", 0, 4, struct_sticksConfig, stick_name_valid),
   YAML_ARRAY("switchConfig", 2, 8, struct_switchConfig, nullptr),
   YAML_PADDING( 96 ),
@@ -825,8 +823,8 @@ static const struct YamlNode struct_ModelData[] = {
   YAML_STRUCT("swashR", 64, struct_SwashRingData, swash_is_active),
   YAML_ARRAY("flightModeData", 288, 9, struct_FlightModeData, fmd_is_active),
   YAML_UNSIGNED_CUST( "thrTraceSrc", 8, r_thrSrc, w_thrSrc ),
-  YAML_UNSIGNED_CUST( "switchWarningState", 16, r_swtchWarn, w_swtchWarn ),
-  YAML_UNSIGNED( "switchWarningEnable", 8 ),
+  YAML_CUSTOM("switchWarningState",r_swtchWarn,w_swtchWarn),
+  YAML_PADDING( 32 ),
   YAML_ARRAY("gvars", 56, 9, struct_GVarData, NULL),
   YAML_STRUCT("varioData", 40, struct_VarioData, NULL),
   YAML_UNSIGNED_CUST( "rssiSource", 8, r_tele_sensor, w_tele_sensor ),