diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 020c711fa8..6cd94a8630 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1414,9 +1414,6 @@ static int generic_action_ok_network(const char *path,
          break;
    }
 
-//   rarch_main_data_msg_queue_push(DATA_TYPE_HTTP, url_path, url_label, 0, 1,
-//         true);
-
    rarch_task_push_http_transfer(url_path, url_label, callback, NULL);
 
    return generic_action_ok_displaylist_push(path,
diff --git a/menu/menu.c b/menu/menu.c
index c3c8a43e68..3b89c02c90 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -251,6 +251,7 @@ void *menu_init(const void *data)
    menu->help_screen_type           = MENU_HELP_WELCOME;
    settings->menu_show_start_screen = false;
 
+   /* TODO/FIXME - Update to newer tasks */
 #if 0
    if (settings->bundle_assets_extract_enable &&
          (strcmp(PACKAGE_VERSION, settings->bundle_assets_last_extracted_version) != 0)
diff --git a/runloop_data.c b/runloop_data.c
index 7b3d05a5f8..a04280d3c2 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -73,46 +73,6 @@ void rarch_main_data_clear_state(void)
    rarch_main_data_init();
 }
 
-void rarch_main_data_msg_queue_push(unsigned type,
-      const char *msg, const char *msg2,
-      unsigned prio, unsigned duration, bool flush)
-{
-   char new_msg[PATH_MAX_LENGTH];
-   msg_queue_t *queue            = NULL;
-   settings_t     *settings      = config_get_ptr();
-
-   (void)settings;
-
-   switch(type)
-   {
-      case DATA_TYPE_NONE:
-         break;
-      case DATA_TYPE_FILE:
-         break;
-      case DATA_TYPE_IMAGE:
-         break;
-#ifdef HAVE_NETWORKING
-      case DATA_TYPE_HTTP:
-         break;
-#endif
-#ifdef HAVE_OVERLAY
-      case DATA_TYPE_OVERLAY:
-         break;
-#endif
-      case DATA_TYPE_DB:
-      default:
-         break;
-   }
-
-   if (!queue)
-      return;
-
-   if (flush)
-      msg_queue_clear(queue);
-   msg_queue_push(queue, new_msg, prio, duration);
-
-}
-
 void data_runloop_osd_msg(const char *msg, size_t len)
 {
    strlcpy(data_runloop_msg, msg, len);
diff --git a/runloop_data.h b/runloop_data.h
index 68403cad67..ed28825326 100644
--- a/runloop_data.h
+++ b/runloop_data.h
@@ -24,20 +24,6 @@ extern "C" {
 
 typedef int (*transfer_cb_t)(void *data, size_t len);
 
-enum runloop_data_type
-{
-   DATA_TYPE_NONE = 0,
-   DATA_TYPE_FILE,
-   DATA_TYPE_IMAGE,
-   DATA_TYPE_HTTP,
-   DATA_TYPE_OVERLAY,
-   DATA_TYPE_DB
-};
-
-void rarch_main_data_msg_queue_push(unsigned type,
-      const char *msg, const char *msg2,
-      unsigned prio, unsigned duration, bool flush);
-
 void rarch_main_data_clear_state(void);
 
 void rarch_main_data_iterate(void);