diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index 0b54803e2b..b734fc9c1a 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -1356,8 +1356,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
          return "Borrando archivo temporal de contenido";
       case MSG_LOADED_STATE_FROM_SLOT:
          return "Carga rápida desde la ranura";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "No se ha podido procesar el archivo ZIP.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Escaneado de carpetas terminado";
       case MSG_SCANNING:
@@ -1392,8 +1390,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
          return "Se ha llegado al final del búfer de rebobinado.";
       case MSG_CHEEVOS_HARDCORE_MODE_ENABLE:
          return "Modo Extremo Activado: guardar estado y reboninar se han desactivado.";
-      case MSG_TASK_FAILED:
-        return "Error";
       case MSG_DOWNLOADING:
         return "Descargando";
       case MSG_EXTRACTING:
@@ -1555,8 +1551,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg)
          return "RetroKeyboard";
       case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
          return "Bloquear fotogramas";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE:
-         return "Modo de asignación";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
          return "Mostrar etiquetas de descripción de la entrada";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c
index 033f091a9f..676c0c4e01 100644
--- a/intl/msg_hash_fr.c
+++ b/intl/msg_hash_fr.c
@@ -185,8 +185,6 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
          return "Suppression du fichier temporaire";
       case MSG_LOADED_STATE_FROM_SLOT:
          return "Chargement du savestate à partir du slot";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "Impossible de traiter le fichier ZIP.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Analyse des dossiers terminée";
       case MSG_SCANNING:
@@ -221,8 +219,6 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
          return "Atteinte de la fin du tampon de rembobinage.";
       case MSG_CHEEVOS_HARDCORE_MODE_ENABLE:
          return "Mode matériel activé : savestate et rembobinage sont désactivés.";
-      case MSG_TASK_FAILED:
-         return "Échec";
       case MSG_DOWNLOADING:
          return "Téléchargement";
       case MSG_EXTRACTING:
diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c
index 2e4729eaf5..08c94f586d 100644
--- a/intl/msg_hash_it.c
+++ b/intl/msg_hash_it.c
@@ -1299,8 +1299,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg)
          return "RetroTastiera";
       case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
          return "Blocco fotogrammi";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE:
-         return "Modalità di collegamento";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
          return "Mostra le etichette descrittive degli input del core";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
diff --git a/intl/msg_hash_jp.c b/intl/msg_hash_jp.c
index 2847899bdd..291a347cef 100644
--- a/intl/msg_hash_jp.c
+++ b/intl/msg_hash_jp.c
@@ -1908,8 +1908,6 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
          return "Connecting to netplay host";
       case MSG_GOT_CONNECTION_FROM:
          return "Got connection from";
-      case MSG_SHUTTING_DOWN:
-         return "shutting_down";
       case MSG_AUTODETECT:
          return "Autodetect";
       case MSG_SUCCEEDED:
@@ -1924,8 +1922,6 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
          return "File already exists. Saving to backup buffer";
       case MSG_AUTOLOADING_SAVESTATE_FROM:
          return "Auto-loading savestate from";
-      case MSG_REBOOTING:
-         return "rebooting";
       case MSG_CONNECTING_TO_PORT:
          return "Connecting to port";
       case MSG_SETTING_DISK_IN_TRAY:
@@ -2148,8 +2144,6 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
          return "cheevos_password";
       case MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME:
          return "accounts_cheevos_username";
-      case MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_PASSWORD:
-         return "accounts_cheevos_password";
       case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS:
          return "retro_achievements";
       case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST:
@@ -3245,8 +3239,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "Saved new config to";
       case MSG_FAILED_SAVING_CONFIG_TO:
          return "Failed saving config to";
-      case MSG_FAILED_TO_SEND_HEADER_TO_CLIENT:
-         return "Failed to send header to client.";
       case MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST:
          return "Failed to receive nickname size from host.";
       case MSG_FAILED_TO_RECEIVE_NICKNAME:
@@ -3485,8 +3477,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "Removing temporary content file";
       case MSG_LOADED_STATE_FROM_SLOT:
          return "Loaded state from slot";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "Could not process ZIP file.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Scanning of directory finished";
       case MSG_SCANNING:
@@ -3521,8 +3511,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "Reached end of rewind buffer.";
       case MSG_CHEEVOS_HARDCORE_MODE_ENABLE:
          return "Hardcore Mode Enabled: savestate & rewind were disabled.";
-      case MSG_TASK_FAILED:
-         return "失敗";
       case MSG_DOWNLOADING:
          return "ダウンロード中";
       case MSG_EXTRACTING:
@@ -3747,8 +3735,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
          return "RetroKeyboard";
       case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
          return "Block Frames";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE:
-         return "Bind Mode";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
          return "入力の識別子ラベルを表示";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c
index 4d3d17771d..864088cbfe 100644
--- a/intl/msg_hash_pl.c
+++ b/intl/msg_hash_pl.c
@@ -162,8 +162,6 @@ const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
          return "Usuwanie tymczasowego pliku treści";
       case MSG_LOADED_STATE_FROM_SLOT:
          return "Wczytano stan ze slotu";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "Nie udało się przetworzyć pliku ZIP.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Zakończono skanowanie katalogu";
       case MSG_SCANNING:
diff --git a/intl/msg_hash_pt.c b/intl/msg_hash_pt.c
index 365cdaa8d6..cabfbc9a68 100644
--- a/intl/msg_hash_pt.c
+++ b/intl/msg_hash_pt.c
@@ -1058,8 +1058,6 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
          return "Removendo conteúdo temporário";
       case MSG_LOADED_STATE_FROM_SLOT:
          return "Estado carregado do slot";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "Incapaz de processar arquivo ZIP.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Exame de diretório concluído";
       case MSG_SCANNING:
@@ -1092,8 +1090,6 @@ const char *msg_hash_to_str_pt(enum msg_hash_enums msg)
          return "Retrocedendo.";
       case MSG_REWIND_REACHED_END:
          return "Final do buffer de retrocesso atingido.";
-      case MSG_TASK_FAILED:
-         return "Falhou";
       case MSG_DOWNLOADING:
          return "Baixando";
       case MSG_EXTRACTING:
diff --git a/intl/msg_hash_ru.c b/intl/msg_hash_ru.c
index d504cd5975..d3e2ec7eb1 100644
--- a/intl/msg_hash_ru.c
+++ b/intl/msg_hash_ru.c
@@ -148,8 +148,6 @@ const char *msg_hash_to_str_ru(enum msg_hash_enums msg)
          return "Загружено сохранение из слота";
       case MSG_DOWNLOADING:
          return "Прогресс загрузки";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "Ошибка обработки ZIP-архива.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Сканирование папки завершено";
       case MSG_SCANNING:
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index c1148d114a..8e870f1dd5 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -1907,8 +1907,6 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
          return "Connecting to netplay host";
       case MSG_GOT_CONNECTION_FROM:
          return "Got connection from";
-      case MSG_SHUTTING_DOWN:
-         return "shutting_down";
       case MSG_AUTODETECT:
          return "Autodetect";
       case MSG_SUCCEEDED:
@@ -1923,8 +1921,6 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
          return "File already exists. Saving to backup buffer";
       case MSG_AUTOLOADING_SAVESTATE_FROM:
          return "Auto-loading savestate from";
-      case MSG_REBOOTING:
-         return "rebooting";
       case MSG_CONNECTING_TO_PORT:
          return "Connecting to port";
       case MSG_SETTING_DISK_IN_TRAY:
@@ -2147,8 +2143,6 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
          return "cheevos_password";
       case MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME:
          return "accounts_cheevos_username";
-      case MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_PASSWORD:
-         return "accounts_cheevos_password";
       case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS:
          return "retro_achievements";
       case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST:
@@ -3244,8 +3238,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Saved new config to";
       case MSG_FAILED_SAVING_CONFIG_TO:
          return "Failed saving config to";
-      case MSG_FAILED_TO_SEND_HEADER_TO_CLIENT:
-         return "Failed to send header to client.";
       case MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST:
          return "Failed to receive nickname size from host.";
       case MSG_FAILED_TO_RECEIVE_NICKNAME:
@@ -3484,8 +3476,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Removing temporary content file";
       case MSG_LOADED_STATE_FROM_SLOT:
          return "Loaded state from slot";
-      case MSG_COULD_NOT_PROCESS_ZIP_FILE:
-         return "Could not process ZIP file.";
       case MSG_SCANNING_OF_DIRECTORY_FINISHED:
          return "Scanning of directory finished";
       case MSG_SCANNING:
@@ -3520,8 +3510,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Reached end of rewind buffer.";
       case MSG_CHEEVOS_HARDCORE_MODE_ENABLE:
          return "Hardcore Mode Enabled: savestate & rewind were disabled.";
-      case MSG_TASK_FAILED:
-         return "Failed";
       case MSG_DOWNLOADING:
          return "Downloading";
       case MSG_EXTRACTING:
@@ -3746,8 +3734,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "RetroKeyboard";
       case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
          return "Block Frames";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE:
-         return "Bind Mode";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
          return "Display Input Descriptor Labels";
       case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
diff --git a/msg_hash.h b/msg_hash.h
index f57578f83d..93771254cd 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -152,9 +152,7 @@ enum msg_hash_enums
    MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32,
    MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE,
    MSG_FILE_NOT_FOUND,
-   MSG_SHUTTING_DOWN,
    MSG_VALUE_SHUTTING_DOWN,
-   MSG_REBOOTING,
    MSG_VALUE_REBOOTING,
    MSG_FAILED_TO_START_AUDIO_DRIVER,
    MSG_FOUND_LAST_STATE_SLOT,
@@ -176,7 +174,6 @@ enum msg_hash_enums
    MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT,
    MSG_FAILED_TO_SEND_NICKNAME_TO_CLIENT,
    MSG_FAILED_TO_SEND_NICKNAME_TO_HOST,
-   MSG_FAILED_TO_SEND_HEADER_TO_CLIENT,
    MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST,
    MSG_FAILED_TO_RECEIVE_NICKNAME,
    MSG_FAILED_TO_RECEIVE_NICKNAME_FROM_HOST,
@@ -298,7 +295,6 @@ enum msg_hash_enums
    MSG_REDIRECTING_CHEATFILE_TO,
    MSG_SCANNING,
    MSG_SCANNING_OF_DIRECTORY_FINISHED,
-   MSG_COULD_NOT_PROCESS_ZIP_FILE,
    MSG_LOADED_STATE_FROM_SLOT,
    MSG_REMOVING_TEMPORARY_CONTENT_FILE,
    MSG_FAILED_TO_REMOVE_TEMPORARY_FILE,
@@ -328,7 +324,6 @@ enum msg_hash_enums
    MSG_REMOVED_DISK_FROM_TRAY,
    MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY,
    MSG_GOT_INVALID_DISK_INDEX,
-   MSG_TASK_FAILED,
    MSG_DOWNLOADING,
    MSG_EXTRACTING,
    MSG_EXTRACTING_FILE,
@@ -484,7 +479,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
    MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW,
    MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND,
-   MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE,
    MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
    MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
    MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD,
@@ -782,7 +776,6 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_CHEEVOS_PASSWORD,
 
    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS,
-   MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_PASSWORD,
    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD,
 
    MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,