diff --git a/runloop.c b/runloop.c
index caf7fe068c..72d98b1efd 100644
--- a/runloop.c
+++ b/runloop.c
@@ -4541,25 +4541,6 @@ bool runloop_event_init_core(
 #ifdef HAVE_NETWORKING
    if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
    {
-#if 0
-//#ifdef HAVE_UPDATE_CORES
-      /* If netplay is enabled, update the core before initializing. */
-      const char *path_core = path_get(RARCH_PATH_CORE);
-
-      if (!string_is_empty(path_core) &&
-            !string_is_equal(path_core, "builtin"))
-      {
-         if (task_push_update_single_core(path_core,
-               settings->bools.core_updater_auto_backup,
-               settings->uints.core_updater_auto_backup_history_size,
-               settings->paths.directory_libretro,
-               settings->paths.directory_core_assets))
-            /* We must wait for the update to finish
-               before starting the core. */
-            task_queue_wait(NULL, NULL);
-      }
-#endif
-
       /* We need this in order for core_info_current_supports_netplay
          to work correctly at init_netplay,
          called later at event_init_content. */
diff --git a/tasks/task_core_updater.c b/tasks/task_core_updater.c
index 4fdb16cfc9..450b3430bc 100644
--- a/tasks/task_core_updater.c
+++ b/tasks/task_core_updater.c
@@ -134,6 +134,7 @@ typedef struct update_installed_cores_handle
    bool auto_backup;
 } update_installed_cores_handle_t;
 
+#if 0
 enum update_single_core_status
 {
    UPDATE_SINGLE_CORE_BEGIN = 0,
@@ -153,6 +154,7 @@ typedef struct update_single_core_handle
    char path_dir_core_assets[PATH_MAX_LENGTH];
    bool auto_backup;
 } update_single_core_handle_t;
+#endif
 
 #if defined(ANDROID)
 /* Play feature delivery core install */
@@ -1457,6 +1459,7 @@ task_finished:
       free_update_installed_cores_handle(update_installed_handle);
 }
 
+#if 0
 static void task_update_single_core_handler(retro_task_t *task)
 {
    update_single_core_handle_t *handle =
@@ -1559,12 +1562,16 @@ static void task_update_single_core_cleanup(retro_task_t *task)
    core_updater_list_free(handle->core_list);
    free(handle);
 }
+#endif
 
 static bool task_update_installed_cores_finder(retro_task_t *task, void *user_data)
 {
    if (task)
       if (     task->handler == task_update_installed_cores_handler
-            || task->handler == task_update_single_core_handler)
+#if 0
+            || task->handler == task_update_single_core_handler
+#endif
+            )
          return true;
    return false;
 }
@@ -1588,8 +1595,8 @@ void task_push_update_installed_cores(
 #endif
 
    /* Sanity check */
-   if (!update_installed_handle ||
-       string_is_empty(path_dir_libretro))
+   if (  !update_installed_handle
+       || string_is_empty(path_dir_libretro))
       goto error;
 
    /* Configure handle */
@@ -1648,6 +1655,7 @@ error:
       free_update_installed_cores_handle(update_installed_handle);
 }
 
+#if 0
 bool task_push_update_single_core(
       const char *path_core, bool auto_backup, size_t auto_backup_history_size,
       const char *path_dir_libretro, const char *path_dir_core_assets)
@@ -1708,6 +1716,7 @@ bool task_push_update_single_core(
 
    return true;
 }
+#endif
 
 #if defined(ANDROID)
 /**************************************/
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 0a35bbad8a..8dab9b319c 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -143,9 +143,11 @@ void task_push_update_installed_cores(
       bool auto_backup, size_t auto_backup_history_size,
       const char *path_dir_libretro,
       const char *path_dir_core_assets);
+#if 0
 bool task_push_update_single_core(
       const char *path_core, bool auto_backup, size_t auto_backup_history_size,
       const char *path_dir_libretro, const char *path_dir_core_assets);
+#endif
 #if defined(ANDROID)
 void *task_push_play_feature_delivery_core_install(
       core_updater_list_t* core_list,