diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 14f94def6c..5ea757117d 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -574,7 +574,7 @@ async fn handle_receive_completed_job<
 >(
     jc: JobCompleted,
     base_internal_url: String,
-    db: Pool<Postgres>,
+    db: &Pool<Postgres>,
     worker_dir: String,
     same_worker_tx: Sender<SameWorkerPayload>,
     rsmq: Option<R>,
@@ -597,7 +597,7 @@ async fn handle_receive_completed_job<
     if let Err(err) = process_completed_job(
         jc,
         &client,
-        &db,
+        db,
         &worker_dir,
         same_worker_tx.clone(),
         rsmq.clone(),
@@ -609,7 +609,7 @@ async fn handle_receive_completed_job<
     .await
     {
         handle_job_error(
-            &db,
+            db,
             &client,
             job.as_ref(),
             mem_peak,
@@ -1191,138 +1191,42 @@ pub async fn run_worker<R: rsmq_async::RsmqConnection + Send + Sync + Clone + 's
                     }
                     let base_internal_url2 = base_internal_url2.clone();
                     let worker_dir2 = worker_dir2.clone();
-                    let db2 = db2.clone();
                     let same_worker_tx2 = same_worker_tx2.clone();
                     let rsmq2 = rsmq2.clone();
                     let worker_name = worker_name2.clone();
-                    if matches!(jc.job.job_kind, JobKind::Noop) {
-                        thread_count.fetch_add(1, Ordering::SeqCst);
-                        let thread_count = thread_count.clone();
 
-                        loop {
-                            if thread_count.load(Ordering::Relaxed) < 4 {
-                                break;
-                            }
-                            tokio::time::sleep(Duration::from_millis(3)).await;
-                        }
-
-                        #[cfg(feature = "benchmark")]
-                        let send_duration = send_duration2.clone();
-                        #[cfg(feature = "benchmark")]
-                        let process_duration = process_duration.clone();
-                        #[cfg(feature = "benchmark")]
-                        let completed_jobs = completed_jobs.clone();
-                        #[cfg(feature = "benchmark")]
-                        let main_duration = main_duration2.clone();
-
-                        #[cfg(feature = "prometheus")]
-                        let worker_save_completed_job_duration2 =
-                            worker_save_completed_job_duration.clone();
-                        #[cfg(feature = "prometheus")]
-                        let worker_flow_transition_duration2 =
-                            worker_flow_transition_duration.clone();
-                        let killpill_tx = killpill_tx2.clone();
-                        let job_completed_sender = job_completed_sender.clone();
-                        tokio::spawn(async move {
-                            #[cfg(feature = "benchmark")]
-                            let process_start = Instant::now();
-
-                            let is_dependency_job = matches!(
-                                jc.job.job_kind,
-                                JobKind::Dependencies | JobKind::FlowDependencies
-                            );
-                            handle_receive_completed_job(
-                                jc,
-                                base_internal_url2,
-                                db2.clone(),
-                                worker_dir2,
-                                same_worker_tx2,
-                                rsmq2,
-                                &worker_name,
-                                worker_save_completed_job_duration2.clone(),
-                                worker_flow_transition_duration2.clone(),
-                                job_completed_sender.clone(),
-                            )
-                            .await;
-                            #[cfg(feature = "benchmark")]
-                            {
-                                let n = completed_jobs.fetch_add(1, Ordering::SeqCst);
-                                if (n + 1) % 1000 == 0 || n == (jobs - 1) as usize {
-                                    let duration_s = start.elapsed().as_secs_f64();
-                                    let jobs_per_sec = n as f64 / duration_s;
-                                    tracing::info!(
-                                        "completed {} jobs in {}s, {} jobs/s",
-                                        n + 1,
-                                        duration_s,
-                                        jobs_per_sec
-                                    );
-
-                                    tracing::info!(
-                                        "main loop without send {}s",
-                                        main_duration.load(Ordering::SeqCst) as f64 / 1000.0
-                                    );
-
-                                    tracing::info!(
-                                        "send job completed / send dedicated job duration {}s",
-                                        send_duration.load(Ordering::SeqCst) as f64 / 1000.0
-                                    );
-
-                                    tracing::info!(
-                                        "job completed process duration {}s",
-                                        process_duration.load(Ordering::SeqCst) as f64 / 1000.0
-                                    );
-                                }
-
-                                process_duration.fetch_add(
-                                    process_start.elapsed().as_millis() as usize,
-                                    Ordering::SeqCst,
-                                );
-                            }
-
-                            thread_count.fetch_sub(1, Ordering::SeqCst);
-                            if is_dependency_job && is_dedicated_worker {
-                                tracing::error!("Dedicated worker executed a dependency job, a new script has been deployed. Exiting expecting to be restarted.");
-                                sqlx::query!("UPDATE config SET config = config WHERE name = $1", format!("worker__{}", *WORKER_GROUP))
-                            .execute(&db2)
-                            .await
-                            .expect("update config to trigger restart of all dedicated workers at that config");
-                                killpill_tx.send(()).unwrap_or_default();
-
-                            }
-                        });
-                    } else {
-                        let is_init_script_and_failure =
-                            !jc.success && jc.job.tag.as_str() == INIT_SCRIPT_TAG;
-                        let is_dependency_job = matches!(
-                            jc.job.job_kind,
-                            JobKind::Dependencies | JobKind::FlowDependencies);
-                        handle_receive_completed_job(
-                            jc,
-                            base_internal_url2,
-                            db2.clone(),
-                            worker_dir2,
-                            same_worker_tx2,
-                            rsmq2,
-                            &worker_name,
-                            worker_save_completed_job_duration2.clone(),
-                            worker_flow_transition_duration2.clone(),
-                            job_completed_sender.clone(),
-                        )
-                        .await;
-                        if is_init_script_and_failure {
-                            tracing::error!("init script errored, exiting");
-                            killpill_tx2.send(()).unwrap_or_default();
-                        }
-                        if is_dependency_job && is_dedicated_worker {
-                            tracing::error!("Dedicated worker executed a dependency job, a new script has been deployed. Exiting expecting to be restarted.");
-                            sqlx::query!("UPDATE config SET config = config WHERE name = $1", format!("worker__{}", *WORKER_GROUP))
-                        .execute(&db2)
-                        .await
-                        .expect("update config to trigger restart of all dedicated workers at that config");
-                            killpill_tx2.send(()).unwrap_or_default();
-
-                        }
+                    let is_init_script_and_failure =
+                        !jc.success && jc.job.tag.as_str() == INIT_SCRIPT_TAG;
+                    let is_dependency_job = matches!(
+                        jc.job.job_kind,
+                        JobKind::Dependencies | JobKind::FlowDependencies);
+                    handle_receive_completed_job(
+                        jc,
+                        base_internal_url2,
+                        &db2,
+                        worker_dir2,
+                        same_worker_tx2,
+                        rsmq2,
+                        &worker_name,
+                        worker_save_completed_job_duration2.clone(),
+                        worker_flow_transition_duration2.clone(),
+                        job_completed_sender.clone(),
+                    )
+                    .await;
+                    if is_init_script_and_failure {
+                        tracing::error!("init script errored, exiting");
+                        killpill_tx2.send(()).unwrap_or_default();
                     }
+                    if is_dependency_job && is_dedicated_worker {
+                        tracing::error!("Dedicated worker executed a dependency job, a new script has been deployed. Exiting expecting to be restarted.");
+                        sqlx::query!("UPDATE config SET config = config WHERE name = $1", format!("worker__{}", *WORKER_GROUP))
+                    .execute(&db2)
+                    .await
+                    .expect("update config to trigger restart of all dedicated workers at that config");
+                        killpill_tx2.send(()).unwrap_or_default();
+
+                    }
+                    
                 }
                 SendResult::UpdateFlow {
                     flow,