diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 375b13bdd..ff5d3d7cf 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -137,7 +137,6 @@ const char * const audioFilenames[] = {
   "thralert",
   "swalert",
   "baddata",
-  "format",
   "lowbatt",
   "inactiv",
   "a1_org",
@@ -155,6 +154,7 @@ const char * const audioFilenames[] = {
   "telemok",
   "trainko",
   "trainok",
+  "sensorko",
 #if defined(PCBSKY9X)
   "highmah",
   "hightemp",
@@ -992,9 +992,9 @@ void audioEvent(unsigned int index, unsigned int freq)
 #endif
 
   if (index <= AU_ERROR || (index >= AU_WARNING1 && index < AU_FRSKY_FIRST)) {
-    if (g_eeGeneral.alarmsFlash) {
-      flashCounter = FLASH_DURATION;
-    }
+  if (g_eeGeneral.alarmsFlash) {
+    flashCounter = FLASH_DURATION;
+  }
   }
 
   if (g_eeGeneral.beepMode>0 || (g_eeGeneral.beepMode==0 && index>=AU_TRIM_MOVE) || (g_eeGeneral.beepMode>=-1 && index<=AU_ERROR)) {
@@ -1013,21 +1013,13 @@ void audioEvent(unsigned int index, unsigned int freq)
           break;
         // low battery in tx
         case AU_TX_BATTERY_LOW:
-          audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
-          audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
-          break;
 #if defined(PCBSKY9X)
         case AU_TX_MAH_HIGH:
-          // TODO Rob something better here?
-          audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
-          audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
-          break;
         case AU_TX_TEMP_HIGH:
-          // TODO Rob something better here?
+#endif
           audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
           audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
           break;
-#endif
 #if defined(VOICE)
         case AU_THROTTLE_ALERT:
         case AU_SWITCH_ALERT:
diff --git a/radio/src/storage/eeprom_common.cpp b/radio/src/storage/eeprom_common.cpp
index f9c5ee3ac..d8d65c906 100644
--- a/radio/src/storage/eeprom_common.cpp
+++ b/radio/src/storage/eeprom_common.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) OpenTX
  *
  * Based on code named
- *   th9x - http://code.google.com/p/th9x 
+ *   th9x - http://code.google.com/p/th9x
  *   er9x - http://code.google.com/p/er9x
  *   gruvin9x - http://code.google.com/p/gruvin9x
  *
@@ -122,7 +122,7 @@ void storageEraseAll(bool warn)
     ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
   }
 
-  MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_STORAGE_FORMAT);
+  MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_NONE);
 
   storageFormat();
   storageDirty(EE_GENERAL|EE_MODEL);
diff --git a/radio/src/storage/eeprom_conversions.cpp b/radio/src/storage/eeprom_conversions.cpp
index 205cae70e..aab596972 100644
--- a/radio/src/storage/eeprom_conversions.cpp
+++ b/radio/src/storage/eeprom_conversions.cpp
@@ -1087,7 +1087,7 @@ bool eeConvert()
   ALERT(STR_STORAGE_WARNING, msg, AU_BAD_RADIODATA);
 
   // Message
-  MESSAGE(STR_STORAGE_WARNING, STR_EEPROM_CONVERTING, NULL, AU_STORAGE_FORMAT); // TODO translations
+  MESSAGE(STR_STORAGE_WARNING, STR_EEPROM_CONVERTING, NULL, AU_NONE); // TODO translations
 
   // General Settings conversion
   eeLoadGeneralSettingsData();
diff --git a/radio/src/storage/sdcard_raw.cpp b/radio/src/storage/sdcard_raw.cpp
index 2f9b29ff9..ea670546f 100644
--- a/radio/src/storage/sdcard_raw.cpp
+++ b/radio/src/storage/sdcard_raw.cpp
@@ -241,7 +241,7 @@ void storageEraseAll(bool warn)
     ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
   }
 
-  MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_STORAGE_FORMAT);
+  MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_NONE);
 
   storageFormat();
   storageDirty(EE_GENERAL|EE_MODEL);