Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -838,11 +838,13 @@
 			       (if (file-write-access? *toppath*)
 				   (begin
 				     (with-output-to-file hhf
 				       (lambda ()
 					 (print bestadrs)))
-				     (common:get-homehost))
+				     (begin
+				       (mutex-unlock! *homehost-mutex*)
+				       (car (common:get-homehost))))
 				   #f)))))
 	   (at-home  (or (equal? homehost currhost)
 			 (equal? homehost bestadrs))))
       (set! *home-host* (cons homehost at-home))
       (mutex-unlock! *homehost-mutex*)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -279,15 +279,15 @@
 ;;
 (define (db:setup #!key (areapath #f))
   (or *dbstruct-db*
       (if (common:on-homehost?)
 	  (let* ((dbstruct (make-dbr:dbstruct)))
-	    (db:open-db dbstruct areapath: #f)
+	    (db:open-db dbstruct areapath: areapath)
 	    (set! *dbstruct-db* dbstruct)
 	    dbstruct)
 	  (begin
-	    (debug:print 0 *default-log-port* "ERROR: attempt to open database when not on homehost. Exiting.")
+	    (debug:print 0 *default-log-port* "ERROR: attempt to open database when not on homehost. Exiting. Homehost: " (common:get-homehost))
 	    (exit 1)))))
 
 ;; Open the classic megatest.db file (defaults to open in toppath)
 ;;
 ;;   NOTE: returns a dbdat not a dbstruct!
@@ -2120,15 +2120,18 @@
   (let* ((rdbdat (db:get-db dbstruct run-id))
 	 (rdb    (db:dbdat-get-db rdbdat))
 	 (dbdat  (db:get-db dbstruct #f))
 	 (db     (db:dbdat-get-db dbdat)))
     ;; (db:delay-if-busy rdbdat)
-    (sqlite3:execute rdb "UPDATE tests SET state='DELETED',comment='';")
-    (sqlite3:execute rdb "DELETE FROM test_steps;")
-    (sqlite3:execute rdb "DELETE FROM test_data;")
-    ;; (db:delay-if-busy dbdat)
-    (sqlite3:execute db "UPDATE runs SET state='deleted',comment='' WHERE id=?;" run-id)))
+    (sqlite3:with-transaction
+     db
+     (lambda ()
+       (sqlite3:execute rdb "DELETE FROM test_steps WHERE test_id IN (SELECT id FROM tests WHERE run_id=?);" run-id)
+       (sqlite3:execute rdb "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE run_id=?);"  run-id)
+       (sqlite3:execute rdb "UPDATE tests SET state='DELETED',comment='' WHERE run_id=?;" run-id)
+       ;; (db:delay-if-busy dbdat)
+       (sqlite3:execute db "UPDATE runs SET state='deleted',comment='' WHERE id=?;" run-id)))))
 
 (define (db:update-run-event_time dbstruct run-id)
   (db:with-db
    dbstruct
    #f
@@ -2414,21 +2417,23 @@
     (db:general-call dbdat 'delete-test-data-records (list test-id))
     (sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a',comment='' WHERE id=?;" test-id)))
 
 ;; 
 (define (db:delete-old-deleted-test-records dbstruct)
-  (let ((run-ids  (db:get-all-run-ids dbstruct))
+  (let (;; (run-ids  (db:get-all-run-ids dbstruct))
 	(targtime (- (current-seconds)(* 30 24 60 60)))) ;; one month in the past
-    (for-each
-     (lambda (run-id)
-       (db:with-db
-	dbstruct
-	run-id
-	#t
-	(lambda (db)
-	  (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED' AND event_time<?;" targtime))))
-     run-ids)))
+    (db:with-db
+     dbstruct
+     0
+     #t
+     (lambda (db)
+       (sqlite3:with-transaction
+	db
+	(lambda ()
+	  (sqlite3:execute db "DELETE FROM steps WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);" targtime)
+	  (sqlite3:execute db "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);" targtime)
+	  (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED' AND event_time<?;" targtime)))))))
 
 ;; set tests with state currstate and status currstatus to newstate and newstatus
 ;; use currstate = #f and or currstatus = #f to apply to any state or status respectively
 ;; WARNING: SQL injection risk. NB// See new but not yet used "faster" version below
 ;;

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1669,11 +1669,11 @@
 	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
 	   (if (not (null? tests))
 	       (begin
 		 (case action
 		   ((remove-runs)
-		    (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
+		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    ;; seek and kill in flight -runtests with % as testpatt here
 		    ;; (if (equal? testpatt "%")
 		    (tasks:kill-runner target run-name testpatt)
 		    ;; (debug:print 0 *default-log-port* "not attempting to kill any run launcher processes as testpatt is " testpatt))
 		    (debug:print 1 *default-log-port* "Removing tests for run: " runkey " " (db:get-value-by-header run header "runname")))