Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2309,25 +2309,37 @@
    dbstruct run-id #t
    (lambda (dbdat db)
      (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 ((targtime (- (current-seconds)
-		     (or (configf:lookup-number *configdat* "setup" "keep-deleted-records")
-			 (* 30 24 60 60))))) ;; one month in the past
+(define (db:delete-old-deleted-test-records dbstruct run-id)
+  (let* ((targtime (- (current-seconds)
+		      (or (configf:lookup-number *configdat* "setup" "keep-deleted-records")
+			  (* 7 24 60 60)))) ;; cleanup if over one week old
+	 (mtdbfile (dbmod:run-id->full-dbfname dbstruct run-id))
+	 (qry1     "DELETE FROM test_steps WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);")
+	 (qry2     "DELETE FROM test_data WHERE test_id IN (SELECT id FROM tests WHERE state='DELETED' AND event_time<?);")
+	 (qry3     "DELETE FROM tests WHERE state='DELETED' AND event_time<?;")
+	 (delproc  (lambda (db)
+		     (sqlite3:with-transaction
+		      db
+		      (lambda ()
+			(sqlite3:execute db qry1 targtime)
+			(sqlite3:execute db qry2 targtime)
+			(sqlite3:execute db qry3 targtime))))))
+    ;; first the /tmp db
     (db:with-db
      dbstruct
-     0
+     run-id
      #t
      (lambda (dbdat db)
-       (sqlite3:with-transaction
-	db
-	(lambda ()
-	  (sqlite3:execute db "DELETE FROM test_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)))))))
+       (delproc db)))
+    (if (and (file-exists? mtdbfile)
+	     (file-write-access? mtdbfile))
+	(let* ((db (sqlite3:open-database mtdbfile)))
+	  (delproc db)
+	  (sqlite3:finalize! db)))))
 
 ;; 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: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -59,15 +59,12 @@
 	     (not (file-exists? dbdir)))
 	(create-directory dbdir))
     dbdir))
 
 (define (dbmod:run-id->full-dbfname dbstruct run-id)
-  (conc (dbmod:get-dbdir dbstruct
-
-			 run-id
-
-			 )"/"(dbmod:run-id->dbfname run-id)))
+  (conc (dbmod:get-dbdir dbstruct)
+	"/"(dbmod:run-id->dbfname run-id)))
 
 ;;======================================================================
 ;; Read-only cachedb cached direct from disk method
 ;;======================================================================
 

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -482,12 +482,12 @@
   (rmt:send-receive 'delete-run #f (list run-id)))
 
 (define (rmt:update-run-stats run-id stats)
   (rmt:send-receive 'update-run-stats #f (list run-id stats)))
 
-(define (rmt:delete-old-deleted-test-records)
-  (rmt:send-receive 'delete-old-deleted-test-records #f '()))
+(define (rmt:delete-old-deleted-test-records run-id)
+  (rmt:send-receive 'delete-old-deleted-test-records run-id (list run-id)))
 
 (define (rmt:get-runs runpatt count offset keypatts)
   (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
 
 (define (rmt:simple-get-runs runpatt count offset target last-update)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -2434,10 +2434,12 @@
                    ((kill-runs)
                     (tasks:kill-runner target run-name "%")
                     (debug:print 1 *default-log-port* "Killing tests for run: " runkey " " (db:get-value-by-header run header "runname"))
                     )
 		   ((remove-runs)
+		    ;; use this location to cleanup old DELETED records? No. See below for same call
+		    ;; (rmt:delete-old-deleted-test-records run-id)
 		    ;; (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))
@@ -2724,11 +2726,11 @@
                     (debug:print 1 *default-log-port* "Removing target " target "run: " run-name)
                     (if (not keep-records)
                       (begin
                         (debug:print 1 *default-log-port* "Removing DB records for the run.")
                         (rmt:delete-run run-id)
-                        (rmt:delete-old-deleted-test-records))
+                        (rmt:delete-old-deleted-test-records run-id))
                     )
                     (if (not (equal?  linkspath "/does/not/exist/I"))
 	               (begin 
                          (debug:print 1 *default-log-port* "Recursively removing links dir " linkspath)
                          (runs:recursive-delete-with-error-msg linkspath)))