diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c
index 2245ce1c91..c3219f2ea5 100644
--- a/menu/menu_entries_cbs_deferred_push.c
+++ b/menu/menu_entries_cbs_deferred_push.c
@@ -1550,9 +1550,6 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
 /* HACK - we have to find some way to pass state inbetween
  * function pointer callback functions that don't necessarily
  * call each other. */
-extern char core_updater_list_path[PATH_MAX_LENGTH];
-extern char core_updater_list_label[PATH_MAX_LENGTH];
-extern unsigned core_updater_list_type;
 static char *core_buf;
 static size_t core_len;
 
@@ -1590,8 +1587,7 @@ static int deferred_push_core_updater_list(void *data, void *userdata,
    if (core_buf)
       free(core_buf);
 
-   menu_list_populate_generic(list, core_updater_list_path,
-         core_updater_list_label, core_updater_list_type);
+   menu_list_populate_generic(list, path, label, type);
 
    return 0;
 }
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index afdf9c90a5..da16225ac2 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -27,9 +27,6 @@
 #include "../input/input_remapping.h"
 
 /* FIXME - Global variables, refactor */
-char core_updater_list_path[PATH_MAX_LENGTH];
-char core_updater_list_label[PATH_MAX_LENGTH];
-unsigned core_updater_list_type;
 unsigned rdb_entry_start_game_selection_ptr;
 size_t hack_shader_pass = 0;
 #ifdef HAVE_NETWORKING
@@ -288,11 +285,6 @@ static int action_ok_core_updater_list(const char *path,
    driver->menu->nonblocking_refresh = true;
 
    (void)url_path;
-#ifdef HAVE_NETWORKING
-   strlcpy(core_updater_list_path, path, sizeof(core_updater_list_path));
-   strlcpy(core_updater_list_label, label, sizeof(core_updater_list_label));
-   core_updater_list_type = type;
-#endif
 
    if (settings->network.buildbot_url[0] == '\0')
       return -1;