diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index e32f8e05db..a0999d81f9 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -47,6 +47,10 @@ static int action_select_default(const char *path, const char *label, unsigned t
                break;
            case ST_PATH:
            case ST_DIR:
+           case ST_ACTION:
+           case ST_STRING:
+           case ST_HEX:
+           case ST_BIND:
                action = MENU_ACTION_OK;
                break;
            default:
@@ -56,7 +60,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
     
    if (action == MENU_ACTION_NOOP)
    {
-       if ((cbs && cbs->action_ok) || menu_setting_is_of_general_type(setting))
+       if (cbs && cbs->action_ok)
            action = MENU_ACTION_OK;
        else
        {
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index bf506e43e9..0230573032 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -97,7 +97,7 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
    if (menu_setting_is_of_path_type(setting))
       return MENU_ENTRY_PATH;
 
-   if (menu_setting_is_of_enum_type(setting))
+   if (setting && (setting->type == ST_STRING)  && setting->values)
       return MENU_ENTRY_ENUM;
 
    if (setting)
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index e086e6fb50..daa6c4e958 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -301,9 +301,7 @@ rarch_setting_t *menu_setting_find(const char *label)
    rarch_setting_t *settings = menu_setting_get_ptr();
    uint32_t needle = 0;
 
-   if (!settings)
-      return NULL;
-   if (!label)
+   if (!settings || !label)
       return NULL;
 
    needle = menu_hash_calculate(label);
@@ -6324,37 +6322,3 @@ bool menu_setting_is_of_path_type(rarch_setting_t *setting)
       return true;
    return false;
 }
-
-bool menu_setting_is_of_general_type(rarch_setting_t *setting)
-{
-   if    (
-         setting &&
-         (setting->type > ST_ACTION) &&
-         (setting->type < ST_GROUP)
-         )
-      return true;
-   return false;
-}
-
-bool menu_setting_is_of_numeric_type(rarch_setting_t *setting)
-{
-   if    (
-         setting &&
-         ((setting->type == ST_INT)  ||
-          (setting->type == ST_UINT) ||
-          (setting->type == ST_FLOAT))
-         )
-      return true;
-   return false;
-}
-
-bool menu_setting_is_of_enum_type(rarch_setting_t *setting)
-{
-   if    (
-         setting &&
-         (setting->type == ST_STRING)  &&
-         setting->values
-         )
-      return true;
-   return false;
-}
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index bd37f20383..8fa8b85767 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -297,12 +297,6 @@ rarch_setting_t* menu_setting_new(unsigned mask);
 
 bool menu_setting_is_of_path_type(rarch_setting_t *setting);
 
-bool menu_setting_is_of_general_type(rarch_setting_t *setting);
-
-bool menu_setting_is_of_numeric_type(rarch_setting_t *setting);
-
-bool menu_setting_is_of_enum_type(rarch_setting_t *setting);
-
 int menu_action_handle_setting(rarch_setting_t *setting,
       unsigned type, unsigned action, bool wraparound);