diff --git a/tasks/task_database.c b/tasks/task_database.c
index 515df71959..75f46ceee7 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -532,7 +532,6 @@ static void rarch_dbscan_task_handler(rarch_task_t *task)
       case DATABASE_STATUS_FREE:
       case DATABASE_STATUS_NONE:
          goto task_finished;
-         break;
    }
 
    return;
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 7f5d32bb49..77e5ce0579 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -153,7 +153,6 @@ static void rarch_task_http_transfer_handler(rarch_task_t *task)
          break;
       case HTTP_STATUS_TRANSFER_PARSE:
          goto task_finished;
-         break;
       case HTTP_STATUS_TRANSFER:
          if (!rarch_main_data_http_iterate_transfer(http))
             http->status = HTTP_STATUS_TRANSFER_PARSE;
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 6cce8e3997..043e8a6066 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -622,16 +622,19 @@ static void rarch_task_overlay_handler(rarch_task_t *task)
          rarch_task_overlay_resolve_iterate(loader);
          break;
       case OVERLAY_STATUS_DEFERRED_DONE:
-//         input_overlay_new_done();
-//         break;
+#if 0
+         input_overlay_new_done();
+         break;
+#endif
       case OVERLAY_STATUS_DEFERRED_ERROR:
-//         input_overlay_free();
-//         break;
-
+#if 0
+         input_overlay_free();
+         break;
+#endif
+         break;
       default:
       case OVERLAY_STATUS_NONE:
          goto task_finished;
-         break;
    }
 
    return;