diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index ffb2b2be1..e3f62b4fc 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -432,10 +432,6 @@ PACK(struct ModuleData {
       uint8_t subType:3;
       uint8_t invertedSerial:1; // telemetry serial inverted from standard
     };
-    struct {
-      uint8_t failsafeMode:4;  // only 3 bits used
-      uint8_t freq:2;
-    } r9m;
   };
 
   union {
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 1454407df..ab93a7544 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1095,11 +1095,13 @@ void menuModelSetup(event_t event)
                 CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, DSM2_PROTO_LP45, DSM2_PROTO_DSMX);
               else if (isModuleR9M(EXTERNAL_MODULE)) {
                 uint8_t newR9MType = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].subType, MODULE_SUBTYPE_R9M_FCC, MODULE_SUBTYPE_R9M_LAST, EE_MODEL, isR9MModeAvailable);
+#if !defined(DEBUG)
                 if (newR9MType != g_model.moduleData[EXTERNAL_MODULE].subType && newR9MType > MODULE_SUBTYPE_R9M_EU) {
                   POPUP_WARNING(STR_R9MFLEXWARN1);
                   const char * w = STR_R9MFLEXWARN2;
                   SET_WARNING_INFO(w, strlen(w), 0);
                 }
+#endif
                 g_model.moduleData[EXTERNAL_MODULE].subType = newR9MType;
               }
 
diff --git a/radio/src/storage/datacopy.cpp b/radio/src/storage/datacopy.cpp
index 515779b90..7878c4042 100644
--- a/radio/src/storage/datacopy.cpp
+++ b/radio/src/storage/datacopy.cpp
@@ -1,4 +1,4 @@
-//This file was auto-generated by generate_datacopy.py script on Wed Apr  3 12:29:34 2019. Do not edit this file!
+//This file was auto-generated by generate_datacopy.py script on Wed Apr 24 15:43:44 2019. Do not edit this file!
 
 
 
@@ -167,12 +167,12 @@ void copyRssiAlarmData(A * dest, B * src)
 template <class A, class B>
 void copyVarioData(A * dest, B * src)
 {
-  dest->varioSource = src->varioSource;
-  dest->varioCenterSilent = src->varioCenterSilent;
-  dest->varioCenterMax = src->varioCenterMax;
-  dest->varioCenterMin = src->varioCenterMin;
-  dest->varioMin = src->varioMin;
-  dest->varioMax = src->varioMax;
+  dest->source = src->source;
+  dest->centerSilent = src->centerSilent;
+  dest->centerMax = src->centerMax;
+  dest->centerMin = src->centerMin;
+  dest->min = src->min;
+  dest->max = src->max;
 }
 
 template <class A, class B>
@@ -181,6 +181,7 @@ void copyTelemetrySensor(A * dest, B * src)
   dest->id = src->id;
   copyTelemetrySensor_frskyInstance(&dest->frskyInstance, &src->frskyInstance);
   memcpy(dest->label, src->label, sizeof(dest->label));
+  dest->subId = src->subId;
   dest->type = src->type;
   dest->unit = src->unit;
   dest->prec = src->prec;
@@ -189,7 +190,7 @@ void copyTelemetrySensor(A * dest, B * src)
   dest->logs = src->logs;
   dest->persistent = src->persistent;
   dest->onlyPositive = src->onlyPositive;
-  dest->subId = src->subId;
+  dest->spare = src->spare;
   dest->param = src->param;
 }
 
@@ -212,7 +213,6 @@ void copyModuleData(A * dest, B * src)
   dest->rfProtocol = src->rfProtocol;
   dest->channelsStart = src->channelsStart;
   dest->channelsCount = src->channelsCount;
-  copyModuleData_r9m(&dest->r9m, &src->r9m);
   copyModuleData_ppm(&dest->ppm, &src->ppm);
 }
 
@@ -347,14 +347,6 @@ void copyTelemetrySensor_frskyInstance(A * dest, B * src)
   dest->rxIndex = src->rxIndex;
 }
 
-template <class A, class B>
-void copyModuleData_r9m(A * dest, B * src)
-{
-  dest->failsafeMode = src->failsafeMode;
-  dest->freq = src->freq;
-  dest->region = src->region;
-}
-
 template <class A, class B>
 void copyModuleData_ppm(A * dest, B * src)
 {