diff --git a/command.c b/command.c
index b3454959f7..b7fcc57857 100644
--- a/command.c
+++ b/command.c
@@ -1309,7 +1309,7 @@ static void command_event_set_savestate_auto_index(void)
 
    settings->state_slot = max_idx;
    RARCH_LOG("%s: #%d\n",
-         msg_hash_to_str(MSG_VALUE_FOUND_LAST_STATE_SLOT),
+         msg_hash_to_str(MSG_FOUND_LAST_STATE_SLOT),
          settings->state_slot);
 }
 
@@ -2041,7 +2041,7 @@ bool command_event(enum event_command cmd, void *data)
          if (!settings->audio.mute_enable && !audio_driver_start())
          {
             RARCH_ERR("%s\n",
-                  msg_hash_to_str(MSG_VALUE_FAILED_TO_START_AUDIO_DRIVER));
+                  msg_hash_to_str(MSG_FAILED_TO_START_AUDIO_DRIVER));
             audio_driver_unset_active();
          }
          break;
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index ebd5426b12..d99d41ec2a 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -1253,8 +1253,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
          return "Error al iniciar el juego en red.";
       case MSG_LIBRETRO_ABI_BREAK:
          return "se ha compilado con una versión distinta a esta implementación de libretro.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "Esta implementación no admite guardados rápidos. No se puede utilizar el rebobinado.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "La implementación utiliza sonido multinúcleo. No se puede utilizar el rebobinado.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c
index a0ea7b7fb6..ee669e7e6c 100644
--- a/intl/msg_hash_fr.c
+++ b/intl/msg_hash_fr.c
@@ -69,8 +69,6 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
          return "Échec de l'initialisation du jeu en réseau";
       case MSG_LIBRETRO_ABI_BREAK:
          return "est compilé avec une version différente de la bibliothèque libretro actuelle.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "L'implémentation ne supporte pas la sauvegarde d'état. Impossible d'activer le retour rapide.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "L'implémentation utilise audio thread. Impossible d'activer le retour rapide.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/intl/msg_hash_jp.c b/intl/msg_hash_jp.c
index 52976f1cda..99ad74b3f0 100644
--- a/intl/msg_hash_jp.c
+++ b/intl/msg_hash_jp.c
@@ -3099,13 +3099,13 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "シャットダウンしています。。。";
       case MSG_VALUE_REBOOTING:
          return "再起動しています。。。";
-      case MSG_VALUE_FAILED_TO_START_AUDIO_DRIVER:
+      case MSG_FAILED_TO_START_AUDIO_DRIVER:
          return "Failed to start audio driver. Will continue without audio.";
-      case MSG_VALUE_FOUND_LAST_STATE_SLOT:
+      case MSG_FOUND_LAST_STATE_SLOT:
          return "Found last state slot";
       case MSG_VALUE_CONNECT_DEVICE_FROM_A_VALID_PORT:
          return "Connect device from a valid port.";
-      case MSG_VALUE_DISCONNECT_DEVICE_FROM_A_VALID_PORT:
+      case MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT:
          return "Disconnect device from a valid port.";
       case MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT:
          return "Disconnecting device from port";
@@ -3367,8 +3367,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "インターフェース";
       case MSG_FAILED_TO_PATCH:
          return "パッチに失敗しました";
-      case MSG_CONTENT_PATCHED_SUCCESSFULLY_IN:
-         return "コンテンツをパッチが成功しました";
       case MSG_FATAL_ERROR_RECEIVED_IN:
          return "Fatal error received in";
       case MSG_MOVIE_RECORD_STOPPED:
@@ -3383,8 +3381,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "Failed to initialize netplay.";
       case MSG_LIBRETRO_ABI_BREAK:
          return "is compiled against a different version of libretro than this libretro implementation.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "Implementation does not support save states. Cannot use rewind.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "Implementation uses threaded audio. Cannot use rewind.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c
index ac2d127756..ce1072fca2 100644
--- a/intl/msg_hash_pl.c
+++ b/intl/msg_hash_pl.c
@@ -50,8 +50,6 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
          return "Nie udało się zainicjalizować gry sieciowej.";
       case MSG_LIBRETRO_ABI_BREAK:
          return "został skompilowany dla innej wersji libretro, różnej od obecnie używanej.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "Implementacja nie wspiera zapisywania stanu. Przewijanie nie jest możliwe.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "Implementacja używa osobnego wątku do przetwarzania dźwięku. Przewijanie nie jest możliwe.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/intl/msg_hash_ru.c b/intl/msg_hash_ru.c
index 665fa82750..d504cd5975 100644
--- a/intl/msg_hash_ru.c
+++ b/intl/msg_hash_ru.c
@@ -34,8 +34,6 @@ const char *msg_hash_to_str_ru(enum msg_hash_enums msg)
          return "Ошибка запуска сетевой игры.";
       case MSG_LIBRETRO_ABI_BREAK:
          return "скомпилировано для другой версии libretro.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "Ядро не поддерживает сохранения. Перемотка невозможна.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "Ядро использует многопоточный звук. Перемотка невозможна.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index 88242672e0..26bbcfeb27 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -3101,13 +3101,13 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Shutting down...";
       case MSG_VALUE_REBOOTING:
          return "Rebooting...";
-      case MSG_VALUE_FAILED_TO_START_AUDIO_DRIVER:
+      case MSG_FAILED_TO_START_AUDIO_DRIVER:
          return "Failed to start audio driver. Will continue without audio.";
-      case MSG_VALUE_FOUND_LAST_STATE_SLOT:
+      case MSG_FOUND_LAST_STATE_SLOT:
          return "Found last state slot";
       case MSG_VALUE_CONNECT_DEVICE_FROM_A_VALID_PORT:
          return "Connect device from a valid port.";
-      case MSG_VALUE_DISCONNECT_DEVICE_FROM_A_VALID_PORT:
+      case MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT:
          return "Disconnect device from a valid port.";
       case MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT:
          return "Disconnecting device from port";
@@ -3369,8 +3369,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Interface";
       case MSG_FAILED_TO_PATCH:
          return "Failed to patch";
-      case MSG_CONTENT_PATCHED_SUCCESSFULLY_IN:
-         return "Content patched successfully";
       case MSG_FATAL_ERROR_RECEIVED_IN:
          return "Fatal error received in";
       case MSG_MOVIE_RECORD_STOPPED:
@@ -3385,8 +3383,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Failed to initialize netplay.";
       case MSG_LIBRETRO_ABI_BREAK:
          return "is compiled against a different version of libretro than this libretro implementation.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "Implementation does not support save states. Cannot use rewind.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "Implementation uses threaded audio. Cannot use rewind.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/intl/msg_hash_uspseudo.c b/intl/msg_hash_uspseudo.c
index 99143021d7..23be4119d7 100644
--- a/intl/msg_hash_uspseudo.c
+++ b/intl/msg_hash_uspseudo.c
@@ -3168,8 +3168,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Interfaçe";
       case MSG_FAILED_TO_PATCH:
          return "Fåilêd tò pätch";
-      case MSG_CONTENT_PATCHED_SUCCESSFULLY_IN:
-         return "Cõntent patchëd successfully";
       case MSG_FATAL_ERROR_RECEIVED_IN:
          return "Fãtal error receïved iñ";
       case MSG_MOVIE_RECORD_STOPPED:
@@ -3184,8 +3182,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Fäìled to iñïtializê netplày.";
       case MSG_LIBRETRO_ABI_BREAK:
          return "is compíled àgainst ä different version óf librètro thañ this librêtro implemeñtätîòn.";
-      case MSG_REWIND_INIT_FAILED_NO_SAVESTATES:
-         return "Impleméntatión does nôt support sàvê státes. Canñõt ûse rewind.";
       case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
          return "Ìmplemeñtätíôn ûsës threaded audiõ. Çannot use réwiñd.";
       case MSG_REWIND_INIT_FAILED:
diff --git a/msg_hash.h b/msg_hash.h
index 700cff9fda..36691654dc 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -157,9 +157,7 @@ enum msg_hash_enums
    MSG_REBOOTING,
    MSG_VALUE_REBOOTING,
    MSG_FAILED_TO_START_AUDIO_DRIVER,
-   MSG_VALUE_FAILED_TO_START_AUDIO_DRIVER,
    MSG_FOUND_LAST_STATE_SLOT,
-   MSG_VALUE_FOUND_LAST_STATE_SLOT,
    MSG_RESTORED_OLD_SAVE_STATE,
    MSG_NO_STATE_HAS_BEEN_LOADED_YET,
    MSG_GOT_CONNECTION_FROM,
@@ -171,7 +169,6 @@ enum msg_hash_enums
    MSG_CONNECT_DEVICE_FROM_A_VALID_PORT,
    MSG_VALUE_CONNECT_DEVICE_FROM_A_VALID_PORT,
    MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT,
-   MSG_VALUE_DISCONNECT_DEVICE_FROM_A_VALID_PORT,
    MSG_DISCONNECTING_DEVICE_FROM_PORT,
    MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT,
    MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT,
@@ -232,7 +229,6 @@ enum msg_hash_enums
    MSG_FAILED_TO_PATCH,
    MSG_COULD_NOT_READ_MOVIE_HEADER,
    MSG_CRC32_CHECKSUM_MISMATCH,
-   MSG_CONTENT_PATCHED_SUCCESSFULLY_IN,
    MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED,
    MSG_FAILED_TO_OPEN_LIBRETRO_CORE,
    MSG_COULD_NOT_FIND_ANY_NEXT_DRIVER,
@@ -261,7 +257,6 @@ enum msg_hash_enums
    MSG_REWIND_INIT,
    MSG_REWIND_INIT_FAILED,
    MSG_REWIND_INIT_FAILED_THREADED_AUDIO,
-   MSG_REWIND_INIT_FAILED_NO_SAVESTATES,
    MSG_LIBRETRO_ABI_BREAK,
    MSG_NETPLAY_FAILED,
    MSG_NETPLAY_FAILED_MOVIE_PLAYBACK_HAS_STARTED,
diff --git a/retroarch.c b/retroarch.c
index d285de6d62..2a4a048b46 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -601,7 +601,7 @@ static void retroarch_parse_input(int argc, char *argv[])
                if (port < 1 || port > MAX_USERS)
                {
                   RARCH_ERR("%s\n",
-                        msg_hash_to_str(MSG_VALUE_DISCONNECT_DEVICE_FROM_A_VALID_PORT));
+                        msg_hash_to_str(MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT));
                   retroarch_print_help(argv[0]);
                   retroarch_fail(1, "retroarch_parse_input()");
                }