diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 1524d0562f..94b4411a24 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -604,7 +604,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
    }
    else
    {
-#if 0
       if (cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN)
       {
          switch (cbs->enum_idx)
@@ -827,7 +826,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          }
       }
       else
-#endif
       {
          switch (label_hash)
          {
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index e9376af6b6..d75fe5c1ff 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -1355,7 +1355,6 @@ static void menu_action_setting_disp_set_label(file_list_t* list,
 static int menu_cbs_init_bind_get_string_representation_compare_label(
       menu_file_list_cbs_t *cbs, uint32_t label_hash)
 {
-#if 0
    if (cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN)
    {
       switch (cbs->enum_idx)
@@ -1380,7 +1379,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
             BIND_ACTION_GET_VALUE(cbs,
                   menu_action_setting_disp_set_label_thumbnails);
             break;
-         case MENU_ENUM_LABEL_INPUT_MENU_TOGGLE_GAMEPAD_COMBO:
+         case MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO:
             BIND_ACTION_GET_VALUE(cbs,
                   menu_action_setting_disp_set_label_menu_toggle_gamepad_combo);
             break;
@@ -1467,7 +1466,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
       }
    }
    else
-#endif
    {
       switch (label_hash)
       {
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 7c303f5738..b2b8aab1be 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -422,7 +422,6 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
    }
    else
    {
-#if 0
       if (cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN)
       {
          switch (cbs->enum_idx)
@@ -459,7 +458,6 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
 
       }
       else
-#endif
       {
          switch (label_hash)
          {
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index fa6c80a57d..0b9aa3b7af 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2562,7 +2562,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
       return 0;
    }
 
-#if 0
    if (cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN)
    {
       switch (cbs->enum_idx)
@@ -2803,7 +2802,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
       }
    }
    else
-#endif
    {
       switch (hash)
       {
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 127c022814..e7c87f0a8f 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -537,7 +537,6 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
    }
    else
    {
-#if 0
       if (cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN)
       {
          switch (cbs->enum_idx)
@@ -573,7 +572,6 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
          }
       }
       else
-#endif
       {
          switch (label_hash)
          {
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 0079cab056..ae5644737b 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -702,7 +702,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       }
    }
 
-#if 0
    if (cbs->enum_idx != MENU_ENUM_LABEL_UNKNOWN)
    {
       switch (cbs->enum_idx)
@@ -982,7 +981,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
       }
    }
    else
-#endif
    {
       switch (label_hash)
       {