diff --git a/intl/msg_hash_ar.c b/intl/msg_hash_ar.c
index fc21ba3fa2..2830274aa5 100644
--- a/intl/msg_hash_ar.c
+++ b/intl/msg_hash_ar.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -22,8 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -33,21 +30,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_ar(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_ast.c b/intl/msg_hash_ast.c
index 4849c23590..b2d6697871 100644
--- a/intl/msg_hash_ast.c
+++ b/intl/msg_hash_ast.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,8 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -32,21 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_ast_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_ast(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_ca.c b/intl/msg_hash_ca.c
index f58b607fff..eb3075ab1b 100644
--- a/intl/msg_hash_ca.c
+++ b/intl/msg_hash_ca.c
@@ -22,28 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
-
-#ifdef RARCH_INTERNAL
-#include "../configuration.h"
-#include "../config.def.h"
-
-int msg_hash_get_help_ca_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
-#endif
 
 #ifdef HAVE_MENU
 static const char *menu_hash_to_str_ca_label_enum(enum msg_hash_enums msg)
diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c
index a53f9872dc..c4929d0ff4 100644
--- a/intl/msg_hash_chs.c
+++ b/intl/msg_hash_chs.c
@@ -22,7 +22,6 @@
 
 #include "../msg_hash.h"
 #include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
diff --git a/intl/msg_hash_cht.c b/intl/msg_hash_cht.c
index e9a49d79e1..4297dfecd1 100644
--- a/intl/msg_hash_cht.c
+++ b/intl/msg_hash_cht.c
@@ -22,7 +22,6 @@
 
 #include "../msg_hash.h"
 #include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
diff --git a/intl/msg_hash_cs.c b/intl/msg_hash_cs.c
index 9acba374e2..d8d036ae88 100644
--- a/intl/msg_hash_cs.c
+++ b/intl/msg_hash_cs.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -22,8 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 /* https://support.microsoft.com/en-us/kb/980263 */
@@ -33,21 +30,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_cs_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_cs(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c
index 65627c0af1..ba4f83290b 100644
--- a/intl/msg_hash_de.c
+++ b/intl/msg_hash_de.c
@@ -15,7 +15,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -23,8 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 /* https://support.microsoft.com/en-us/kb/980263 */
@@ -34,21 +31,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_de(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_el.c b/intl/msg_hash_el.c
index dde005d5c5..1a37184466 100644
--- a/intl/msg_hash_el.c
+++ b/intl/msg_hash_el.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #ifdef RARCH_INTERNAL
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
diff --git a/intl/msg_hash_en.c b/intl/msg_hash_en.c
index 7251e71903..0337b608a8 100644
--- a/intl/msg_hash_en.c
+++ b/intl/msg_hash_en.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,8 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -32,21 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_en_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_en(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_eo.c b/intl/msg_hash_eo.c
index 9b0d983a3a..35bc3650d1 100644
--- a/intl/msg_hash_eo.c
+++ b/intl/msg_hash_eo.c
@@ -19,7 +19,6 @@
 #include <compat/strl.h>
 #include <string/stdstring.h>
 
-#include "../configuration.h"
 #include "../msg_hash.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
@@ -30,22 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_eo_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         if (string_is_empty(s))
-            strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len);
-         /* TODO/FIXME - should change this to -1 once we add more entries */
-         break;
-   }
-
-   /* TODO/FIXME - should change this to 0 once we add more entries */
-   return -1;
-}
-
 const char *msg_hash_to_str_eo(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index 6a8ff934ad..5ccebf93f0 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -23,7 +23,6 @@
  * 20 LÍNEAS POR PANTALLA
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -31,8 +30,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -42,21 +39,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_es(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_fa.c b/intl/msg_hash_fa.c
index 0a588e6a84..db7f8be6bf 100644
--- a/intl/msg_hash_fa.c
+++ b/intl/msg_hash_fa.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,7 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -31,24 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-#ifdef RARCH_INTERNAL
-#include "../configuration.h"
-int msg_hash_get_help_fa_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-#endif
-
 const char *msg_hash_to_str_fa(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_fi.c b/intl/msg_hash_fi.c
index c3cf981914..0ace7143e7 100644
--- a/intl/msg_hash_fi.c
+++ b/intl/msg_hash_fi.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -22,24 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
-
-
-int msg_hash_get_help_fi_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
 
 const char *msg_hash_to_str_fi(enum msg_hash_enums msg)
 {
diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c
index 80020896f8..fa8f724051 100644
--- a/intl/msg_hash_fr.c
+++ b/intl/msg_hash_fr.c
@@ -16,7 +16,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -24,8 +23,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -35,21 +32,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_fr(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_he.c b/intl/msg_hash_he.c
index 6019dedac2..636fb816b6 100644
--- a/intl/msg_hash_he.c
+++ b/intl/msg_hash_he.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,7 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -31,24 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-#ifdef RARCH_INTERNAL
-#include "../configuration.h"
-int msg_hash_get_help_he_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-#endif
-
 const char *msg_hash_to_str_he(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_hu.c b/intl/msg_hash_hu.c
index 0b11bcc638..ae22b90dac 100644
--- a/intl/msg_hash_hu.c
+++ b/intl/msg_hash_hu.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,8 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -32,21 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_hu_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_hu(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_id.c b/intl/msg_hash_id.c
index 5e20f3cbc2..07cbdece5a 100644
--- a/intl/msg_hash_id.c
+++ b/intl/msg_hash_id.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -22,8 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 /* https://support.microsoft.com/en-us/kb/980263 */
@@ -33,21 +30,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_id_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_id(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c
index 242e871cd9..e26d231c6c 100644
--- a/intl/msg_hash_it.c
+++ b/intl/msg_hash_it.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -21,7 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -31,21 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_it(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c
index 245b28eccf..fce22f38f3 100644
--- a/intl/msg_hash_ja.c
+++ b/intl/msg_hash_ja.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX)
 #if (_MSC_VER >= 1700 && _MSC_VER < 1900)
diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c
index b32c08713d..4bf7c39684 100644
--- a/intl/msg_hash_ko.c
+++ b/intl/msg_hash_ko.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX)
 #if (_MSC_VER >= 1700 && _MSC_VER < 1900)
diff --git a/intl/msg_hash_nl.c b/intl/msg_hash_nl.c
index 2e7e4387bd..1d0041d1af 100644
--- a/intl/msg_hash_nl.c
+++ b/intl/msg_hash_nl.c
@@ -12,7 +12,6 @@
  *  You should have received a copy of the GNU General Public License along with RetroArch.
  *  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -29,26 +28,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_nl_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MENU_ENUM_LABEL_WELCOME_TO_RETROARCH:
-         snprintf(s, len,
-               "Welkom bij RetroArch\n"
-               );
-         break;
-      default:
-         strlcpy(s, "Geen informatie beschikbaar.", len);
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_nl(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_pl.c b/intl/msg_hash_pl.c
index 78eb948fa8..664b86c22f 100644
--- a/intl/msg_hash_pl.c
+++ b/intl/msg_hash_pl.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,7 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -31,21 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_pl_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_pl(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_ru.c b/intl/msg_hash_ru.c
index 9ba66acba5..6178921921 100644
--- a/intl/msg_hash_ru.c
+++ b/intl/msg_hash_ru.c
@@ -20,7 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -30,25 +29,10 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_ru_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 #ifdef HAVE_MENU
 static const char *menu_hash_to_str_ru_label_enum(enum msg_hash_enums msg)
 {
-   if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
+   if (  msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
          msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
    {
       static char hotkey_lbl[128] = {0};
diff --git a/intl/msg_hash_sk.c b/intl/msg_hash_sk.c
index 14a1f8244d..526983c902 100644
--- a/intl/msg_hash_sk.c
+++ b/intl/msg_hash_sk.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,7 +20,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -31,24 +29,6 @@
 #pragma warning(disable:4566)
 #endif
 
-#ifdef RARCH_INTERNAL
-#include "../configuration.h"
-int msg_hash_get_help_sk_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-#endif
-
 const char *msg_hash_to_str_sk(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_sv.c b/intl/msg_hash_sv.c
index 35b8d2c491..7e147c8752 100644
--- a/intl/msg_hash_sv.c
+++ b/intl/msg_hash_sv.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -22,8 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -33,21 +30,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_sv_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_sv(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_tr.c b/intl/msg_hash_tr.c
index bf252d561e..fe1ca7e672 100644
--- a/intl/msg_hash_tr.c
+++ b/intl/msg_hash_tr.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #ifdef RARCH_INTERNAL
 #include "../configuration.h"
diff --git a/intl/msg_hash_uk.c b/intl/msg_hash_uk.c
index a17b1b2cdb..dbdf00680e 100644
--- a/intl/msg_hash_uk.c
+++ b/intl/msg_hash_uk.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include <stdint.h>
 #include <stddef.h>
 
@@ -22,8 +21,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../configuration.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -33,21 +30,6 @@
 #pragma warning(disable:4566)
 #endif
 
-int msg_hash_get_help_uk_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
 const char *msg_hash_to_str_uk(enum msg_hash_enums msg)
 {
    switch (msg)
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index bf642fda0d..3a3d176131 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -143,82 +143,6 @@ int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
         case MENU_ENUM_LABEL_CORE_LIST:
             strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CORE_LIST), len);
             break;
-#if 0
-        /* These items are only available from the help menu that was hidden by commit ee9b6ba78e8690bb5eff8c978dba3d1649363e6b */
-        case MENU_ENUM_LABEL_VALUE_MENU_ENUM_CONTROLS_PROLOG:
-            snprintf(s, len,
-                     "You can use the following controls below \n"
-                             "on either your gamepad or keyboard in order\n"
-                             "to control the menu: \n"
-                             " \n");
-            break;
-        case MENU_ENUM_LABEL_WELCOME_TO_RETROARCH:
-            snprintf(s, len,
-                     "Welcome to RetroArch\n");
-            break;
-        case MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING_DESC:
-            {
-                /* Work around C89 limitations */
-                char u[501];
-                const char *t =
-                        "RetroArch relies on an unique form of\n"
-                                "audio/video synchronization where it needs to be\n"
-                                "calibrated against the refresh rate of your\n"
-                                "display for best performance results.\n"
-                                " \n"
-                                "If you experience any audio crackling or video\n"
-                                "tearing, usually it means that you need to\n"
-                                "calibrate the settings. Some choices below:\n"
-                                " \n";
-                snprintf(u, sizeof(u), /* can't inline this due to the printf arguments */
-                         "a) Go to '%s' -> '%s', and enable\n"
-                                 "'Threaded Video'. Refresh rate will not matter\n"
-                                 "in this mode, framerate will be higher,\n"
-                                 "but video might be less smooth.\n"
-                                 "b) Go to '%s' -> '%s', and look at\n"
-                                 "'%s'. Let it run for\n"
-                                 "2048 frames, then press 'OK'.",
-                         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS),
-                         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS),
-                         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS),
-                         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS),
-                         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO));
-                strlcpy(s, t, len);
-                strlcat(s, u, len);
-            }
-            break;
-        case MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC:
-            snprintf(s, len,
-                     "To scan for content, go to '%s' and\n"
-                             "select either '%s' or %s'.\n"
-                             "\n"
-                             "Files will be compared to database entries.\n"
-                             "If there is a match, it will add an entry\n"
-                             "to a playlist.\n"
-                             "\n"
-                             "You can then easily access this content by\n"
-                             "going to '%s' ->\n"
-                             "'%s'\n"
-                             "instead of having to go through the\n"
-                             "file browser every time.\n"
-                             "\n"
-                             "NOTE: Content for some cores might still not be\n"
-                             "scannable.",
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_FILE),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB));
-            break;
-        case MENU_ENUM_LABEL_VALUE_EXTRACTING_PLEASE_WAIT:
-            snprintf(s, len,
-                     "Welcome to RetroArch\n"
-                             "\n"
-                             "Extracting assets, please wait.\n"
-                             "This might take a while...\n");
-            break;
-        /* Help menu items end. */
-#endif
         case MENU_ENUM_LABEL_INPUT_DRIVER:
             {
                const char *lbl = settings ? settings->arrays.input_driver : NULL;
@@ -481,56 +405,6 @@ int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
         case MENU_ENUM_LABEL_CHEAT_START_OR_CONT:
             strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHEAT_START_OR_CONT), len);
             break;
-#if 0
-        /* These items are only available from the help menu that was hidden by commit ee9b6ba78e8690bb5eff8c978dba3d1649363e6b */
-        case MENU_ENUM_LABEL_VALUE_WHAT_IS_A_CORE_DESC:
-            snprintf(s, len,
-                     "RetroArch by itself does nothing. \n"
-                            " \n"
-                            "To make it do things, you need to \n"
-                            "load a program into it. \n"
-                            "\n"
-                            "We call such a program 'Libretro core', \n"
-                            "or 'core' in short. \n"
-                            " \n"
-                            "To load a core, select one from\n"
-                            "'Load Core'.\n"
-                            " \n"
-#ifdef HAVE_NETWORKING
-                    "You can obtain cores in several ways: \n"
-                    "* Download them by going to\n"
-                    "'%s' -> '%s'.\n"
-                    "* Manually move them over to\n"
-                    "'%s'.",
-                    msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER),
-                    msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST),
-                    msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH)
-#else
-                            "You can obtain cores by\n"
-                            "manually moving them over to\n"
-                            "'%s'.",
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH)
-#endif
-            );
-            break;
-        case MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD_DESC:
-            snprintf(s, len,
-                     "You can change the virtual gamepad overlay\n"
-                             "by going to '%s' -> '%s'."
-                             " \n"
-                             "From there you can change the overlay,\n"
-                             "change the size and opacity of the buttons, etc.\n"
-                             " \n"
-                             "NOTE: By default, virtual gamepad overlays are\n"
-                             "hidden when in the menu.\n"
-                             "If you'd like to change this behavior,\n"
-                             "you can set '%s' to false.",
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU));
-            break;
-        /* Help menu items end. */
-#endif
 #ifdef HAVE_LAKKA
         case MENU_ENUM_LABEL_TIMEZONE:
             strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_TIMEZONE), len);
diff --git a/intl/msg_hash_val.c b/intl/msg_hash_val.c
index 9ef6d90285..93e8b0c649 100644
--- a/intl/msg_hash_val.c
+++ b/intl/msg_hash_val.c
@@ -22,28 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
-
-#ifdef RARCH_INTERNAL
-#include "../configuration.h"
-#include "../config.def.h"
-
-int msg_hash_get_help_val_enum(enum msg_hash_enums msg, char *s, size_t len)
-{
-   int ret = 0;
-
-   switch (msg)
-   {
-      case MSG_UNKNOWN:
-      default:
-         ret = -1;
-         break;
-   }
-
-   return ret;
-}
-
-#endif
 
 #ifdef HAVE_MENU
 static const char *menu_hash_to_str_val_label_enum(enum msg_hash_enums msg)
diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c
index 5f2bd9f76e..0d1e08f19f 100644
--- a/intl/msg_hash_vn.c
+++ b/intl/msg_hash_vn.c
@@ -22,7 +22,6 @@
 #include <string/stdstring.h>
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
 #if (_MSC_VER >= 1700)
@@ -34,7 +33,7 @@
 
 int msg_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
-   if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
+   if (  msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
          msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
    {
       unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
diff --git a/msg_hash.c b/msg_hash.c
index ac48ee6030..8b8a094331 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -37,33 +37,12 @@ int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
 #ifdef HAVE_LANGEXTRA
    switch (uint_user_language)
    {
-      case RETRO_LANGUAGE_FRENCH:
-         ret = msg_hash_get_help_fr_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_GERMAN:
-         ret = msg_hash_get_help_de_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_SPANISH:
-         ret = msg_hash_get_help_es_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_ITALIAN:
-         ret = msg_hash_get_help_it_enum(msg, s, len);
-         break;
       case RETRO_LANGUAGE_PORTUGUESE_BRAZIL:
          ret = msg_hash_get_help_pt_br_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_PORTUGUESE_PORTUGAL:
          ret = msg_hash_get_help_pt_pt_enum(msg, s, len);
          break;
-      case RETRO_LANGUAGE_DUTCH:
-         ret = msg_hash_get_help_nl_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_ESPERANTO:
-         ret = msg_hash_get_help_eo_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_POLISH:
-         ret = msg_hash_get_help_pl_enum(msg, s, len);
-         break;
       case RETRO_LANGUAGE_JAPANESE:
          ret = msg_hash_get_help_jp_enum(msg, s, len);
          break;
@@ -79,54 +58,33 @@ int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
       case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
          ret = msg_hash_get_help_cht_enum(msg, s, len);
          break;
-      case RETRO_LANGUAGE_ARABIC:
-         ret = msg_hash_get_help_ar_enum(msg, s, len);
-         break;
       case RETRO_LANGUAGE_GREEK:
          ret = msg_hash_get_help_el_enum(msg, s, len);
          break;
       case RETRO_LANGUAGE_TURKISH:
          ret = msg_hash_get_help_tr_enum(msg, s, len);
          break;
-      case RETRO_LANGUAGE_SLOVAK:
-         ret = msg_hash_get_help_sk_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_PERSIAN:
-         ret = msg_hash_get_help_fa_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_HEBREW:
-         ret = msg_hash_get_help_he_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_ASTURIAN:
-         ret = msg_hash_get_help_ast_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_FINNISH:
-         ret = msg_hash_get_help_fi_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_INDONESIAN:
-         ret = msg_hash_get_help_id_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_SWEDISH:
-         ret = msg_hash_get_help_sv_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_UKRAINIAN:
-         ret = msg_hash_get_help_uk_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_CZECH:
-         ret = msg_hash_get_help_cs_enum(msg, s, len);
-         break;
       case RETRO_LANGUAGE_CATALAN_VALENCIA:
-         ret = msg_hash_get_help_val_enum(msg, s, len);
-         break;
-      case RETRO_LANGUAGE_CATALAN:
-         ret = msg_hash_get_help_ca_enum(msg, s, len);
-         break;
+      case RETRO_LANGUAGE_UKRAINIAN:
+      case RETRO_LANGUAGE_SLOVAK:
+      case RETRO_LANGUAGE_PERSIAN:
+      case RETRO_LANGUAGE_ESPERANTO:
       case RETRO_LANGUAGE_BRITISH_ENGLISH:
-         ret = msg_hash_get_help_en_enum(msg, s, len);
-         break;
+      case RETRO_LANGUAGE_CATALAN:
+      case RETRO_LANGUAGE_CZECH:
+      case RETRO_LANGUAGE_HEBREW:
       case RETRO_LANGUAGE_HUNGARIAN:
-         ret = msg_hash_get_help_hu_enum(msg, s, len);
-         break;
+      case RETRO_LANGUAGE_ARABIC:
+      case RETRO_LANGUAGE_ASTURIAN:
+      case RETRO_LANGUAGE_FINNISH:
+      case RETRO_LANGUAGE_INDONESIAN:
+      case RETRO_LANGUAGE_SWEDISH:
+      case RETRO_LANGUAGE_FRENCH:
+      case RETRO_LANGUAGE_GERMAN:
+      case RETRO_LANGUAGE_SPANISH:
+      case RETRO_LANGUAGE_ITALIAN:
+      case RETRO_LANGUAGE_DUTCH:
+      case RETRO_LANGUAGE_POLISH:
       default:
          break;
    }
diff --git a/msg_hash.h b/msg_hash.h
index dac25f3c29..fb4d44786f 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -3930,21 +3930,16 @@ enum msg_hash_enums
 const char *msg_hash_to_str(enum msg_hash_enums msg);
 
 const char *msg_hash_to_str_fr(enum msg_hash_enums msg);
-int msg_hash_get_help_fr_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ru(enum msg_hash_enums msg);
 
 const char *msg_hash_to_str_de(enum msg_hash_enums msg);
-int msg_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_es(enum msg_hash_enums msg);
-int msg_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_eo(enum msg_hash_enums msg);
-int msg_hash_get_help_eo_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_it(enum msg_hash_enums msg);
-int msg_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_jp(enum msg_hash_enums msg);
 int msg_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len);
@@ -3959,10 +3954,8 @@ const char *msg_hash_to_str_pt_pt(enum msg_hash_enums msg);
 int msg_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_pl(enum msg_hash_enums msg);
-int msg_hash_get_help_pl_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_nl(enum msg_hash_enums msg);
-int msg_hash_get_help_nl_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_vn(enum msg_hash_enums msg);
 int msg_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len);
@@ -3977,7 +3970,6 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg);
 int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ar(enum msg_hash_enums msg);
-int msg_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_el(enum msg_hash_enums msg);
 int msg_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len);
@@ -3986,43 +3978,30 @@ const char *msg_hash_to_str_tr(enum msg_hash_enums msg);
 int msg_hash_get_help_tr_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_sk(enum msg_hash_enums msg);
-int msg_hash_get_help_sk_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_fa(enum msg_hash_enums msg);
-int msg_hash_get_help_fa_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_he(enum msg_hash_enums msg);
-int msg_hash_get_help_he_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ast(enum msg_hash_enums msg);
-int msg_hash_get_help_ast_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_fi(enum msg_hash_enums msg);
-int msg_hash_get_help_fi_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_id(enum msg_hash_enums msg);
-int msg_hash_get_help_id_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_sv(enum msg_hash_enums msg);
-int msg_hash_get_help_sv_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_uk(enum msg_hash_enums msg);
-int msg_hash_get_help_uk_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_cs(enum msg_hash_enums msg);
-int msg_hash_get_help_cs_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_val(enum msg_hash_enums msg);
-int msg_hash_get_help_val_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_ca(enum msg_hash_enums msg);
-int msg_hash_get_help_ca_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_en(enum msg_hash_enums msg);
-int msg_hash_get_help_en_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 const char *msg_hash_to_str_hu(enum msg_hash_enums msg);
-int msg_hash_get_help_hu_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 int msg_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len);