diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index b83ff32467..770a01796b 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -239,9 +239,9 @@ static void menu_driver_toggle(bool latch)
    menu_driver_ctl(RARCH_MENU_CTL_TOGGLE, &latch);
 
    if (latch)
-      menu_driver_ctl(RARCH_MENU_CTL_SET_ALIVE, NULL);
+      menu_driver_alive = true;
    else
-      menu_driver_ctl(RARCH_MENU_CTL_UNSET_ALIVE, NULL);
+      menu_driver_alive = false;
 
    runloop_ctl(RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
    runloop_ctl(RUNLOOP_CTL_KEY_EVENT_GET,          &key_event);
@@ -332,25 +332,16 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
       case RARCH_MENU_CTL_SET_PENDING_QUICK_MENU:
          menu_driver_pending_quick_menu = true;
          break;
-      case RARCH_MENU_CTL_UNSET_PENDING_QUICK_MENU:
-         menu_driver_pending_quick_menu = false;
-         break;
       case RARCH_MENU_CTL_IS_PENDING_QUIT:
          return menu_driver_pending_quit;
       case RARCH_MENU_CTL_SET_PENDING_QUIT:
          menu_driver_pending_quit     = true;
          break;
-      case RARCH_MENU_CTL_UNSET_PENDING_QUIT:
-         menu_driver_pending_quit     = false;
-         break;
       case RARCH_MENU_CTL_IS_PENDING_SHUTDOWN:
          return menu_driver_pending_shutdown;
       case RARCH_MENU_CTL_SET_PENDING_SHUTDOWN:
          menu_driver_pending_shutdown = true;
          break;
-      case RARCH_MENU_CTL_UNSET_PENDING_SHUTDOWN:
-         menu_driver_pending_shutdown = false;
-         break;
       case RARCH_MENU_CTL_DESTROY:
          menu_driver_pending_quick_menu = false;
          menu_driver_pending_quit       = false;
@@ -531,12 +522,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
       case RARCH_MENU_CTL_UNSET_TOGGLE:
          menu_driver_toggle(false);
          break;
-      case RARCH_MENU_CTL_SET_ALIVE:
-         menu_driver_alive = true;
-         break;
-      case RARCH_MENU_CTL_UNSET_ALIVE:
-         menu_driver_alive = false;
-         break;
       case RARCH_MENU_CTL_IS_ALIVE:
          return menu_driver_alive;
       case RARCH_MENU_CTL_SET_OWN_DRIVER:
@@ -853,7 +838,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 
             if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_QUICK_MENU, NULL))
             {
-               menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_QUICK_MENU, NULL);
+               menu_driver_pending_quick_menu = false;
                menu_entries_flush_stack(NULL, MENU_SETTINGS);
                menu_display_set_msg_force(true);
 
@@ -862,7 +847,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 
                if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_QUIT, NULL))
                {
-                  menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_QUIT, NULL);
+                  menu_driver_pending_quit     = false;
                   return false;
                }
 
@@ -871,12 +856,12 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 
             if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_QUIT, NULL))
             {
-               menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_QUIT, NULL);
+               menu_driver_pending_quit     = false;
                return false;
             }
             if (menu_driver_ctl(RARCH_MENU_CTL_IS_PENDING_SHUTDOWN, NULL))
             {
-               menu_driver_ctl(RARCH_MENU_CTL_UNSET_PENDING_SHUTDOWN, NULL);
+               menu_driver_pending_shutdown = false;
                if (!command_event(CMD_EVENT_QUIT, NULL))
                   return false;
                return true;
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 6223b9da72..b8f1c3e7f5 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -86,13 +86,10 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET,
    RARCH_MENU_CTL_IS_PENDING_QUICK_MENU,
    RARCH_MENU_CTL_SET_PENDING_QUICK_MENU,
-   RARCH_MENU_CTL_UNSET_PENDING_QUICK_MENU,
    RARCH_MENU_CTL_IS_PENDING_QUIT,
    RARCH_MENU_CTL_SET_PENDING_QUIT,
-   RARCH_MENU_CTL_UNSET_PENDING_QUIT,
    RARCH_MENU_CTL_IS_PENDING_SHUTDOWN,
    RARCH_MENU_CTL_SET_PENDING_SHUTDOWN,
-   RARCH_MENU_CTL_UNSET_PENDING_SHUTDOWN,
    RARCH_MENU_CTL_DEINIT,
    RARCH_MENU_CTL_INIT,
    RARCH_MENU_CTL_SHADER_DEINIT,
@@ -109,8 +106,6 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_IS_TOGGLE,
    RARCH_MENU_CTL_SET_TOGGLE,
    RARCH_MENU_CTL_UNSET_TOGGLE,
-   RARCH_MENU_CTL_SET_ALIVE,
-   RARCH_MENU_CTL_UNSET_ALIVE,
    RARCH_MENU_CTL_IS_ALIVE,
    RARCH_MENU_CTL_DESTROY,
    RARCH_MENU_CTL_IS_SET_TEXTURE,