@@ -811,48 +811,29 @@
     (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
     (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
       (if (> (length (hash-table-keys test-records)) 0)
 	  (let* ((keep-going        #t)
 		 (run-queue-retries 5)
-		;; (th1        (make-thread (lambda ()
-		;; 			    (handle-exceptions
-		;; 				exn
-		;; 				(begin
-		;; 				  (print-call-chain)
-		;; 				  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
-		;; 			      (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
-		;; 						    (any->number reglen) all-tests-registry)))
-		;; 			  "runs:run-tests-queue"))
-		 (th2        (make-thread (lambda ()			 ;; BBQ: why are we visiting ALL runs here?	    
-					    ;; (rmt:find-and-mark-incomplete-all-runs))))) CAN'T INTERRUPT IT ...
-					    (let ((run-ids (rmt:get-all-run-ids)))
-					      (for-each (lambda (run-id)
-							  (if keep-going
-							      (handle-exceptions
-							       exn
-							       (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id ", exn=" exn)
-							       (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
-							run-ids)))
-					  "runs: mark-incompletes")))
-	    ;; (thread-start! th1)
-	    (thread-start! th2)
-	    ;; (thread-join! th1)
-	    ;; just do the main stuff in the main thread
+		 (run-ids (rmt:get-all-run-ids)))
+	    (for-each (lambda (run-id)
+			(if keep-going
+			    (handle-exceptions
+				exn
+			      (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id ", exn=" exn)
+			      (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
+		      run-ids)
 	    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
-								    (any->number reglen) all-tests-registry)
+				  (any->number reglen) all-tests-registry)
 	    (set! keep-going #f)
-	    (thread-join! th2)
-	    ;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
 	    (if (> run-count 0) ;; handle reruns
 		(begin
 		  (if (not (hash-table-ref/default flags "-preclean" #f))
 		      (hash-table-set! flags "-preclean" #t))
 		  (if (not (hash-table-ref/default flags "-rerun" #f))
 		      (hash-table-set! flags "-rerun" "ABORT,STUCK/DEAD,n/a,ZERO_ITEMS"))
-		  ;; recursive call to self
       (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))
-                  (launch:end-of-run-check run-id)))
+                (launch:end-of-run-check run-id)))
 	  (debug:print-info 0 *default-log-port* "No tests to run")))
     (debug:print-info 4 *default-log-port* "All done by here")
     ;; TODO: try putting post hook call here
       
     ;  (debug:print-info 2 *default-log-port* " run-count " run-count)