@@ -1189,11 +1189,11 @@
 ;;
 (define (db:clean-up run-id dbdat)
   (if run-id
     (begin
       (debug:print 0 *default-log-port* "Cleaning run DB " run-id)
-      (db:clean-up-rundb dbdat)
+      (db:clean-up-rundb dbdat run-id)
     )
     (begin
       (debug:print 0 *default-log-port* "Cleaning main DB ")
       (db:clean-up-maindb dbdat)
     )
@@ -1210,38 +1210,42 @@
 ;;    b. If test dir gone, delete the test record
 ;; 2. Look at run records
 ;;    a. If have tests that are not deleted, set state='unknown'
 ;;    b. ....
 ;;
-(define (db:clean-up-rundb dbdat)
+(define (db:clean-up-rundb dbdat run-id)
   ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
   (let* ((db         (dbr:dbdat-dbh dbdat))
-	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests);"))
+	 (test-count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests);"))
+       	 (step-count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM test_steps);"))
 	(statements
 	 (map (lambda (stmt)
 		(sqlite3:prepare db stmt))
 	      (list
-	       ;; delete all tests that belong to runs that are 'deleted'
-	       ;; (conc "DELETE FROM tests WHERE run_id NOT IN (" (string-intersperse (map conc valid-runs) ",") ");")
-	       ;; delete all tests that are 'DELETED'
 	       "DELETE FROM tests WHERE state='DELETED';"
+               "DELETE FROM test_steps WHERE status = 'DELETED';"
+               "DELETE FROM tests WHERE run_id IN (SELECT id FROM runs WHERE state = 'deleted');"
 	       ))))
-    ;; (db:delay-if-busy dbdat)
     (sqlite3:with-transaction 
      db
      (lambda ()
        (sqlite3:for-each-row (lambda (tot)
 			       (debug:print-info 0 *default-log-port* "Test records count before clean: " tot))
-			     count-stmt)
+			     test-count-stmt)
+       (sqlite3:for-each-row (lambda (tot)
+			       (debug:print-info 0 *default-log-port* "Test_step records count before clean: " tot))
+			     step-count-stmt)
        (map sqlite3:execute statements)
        (sqlite3:for-each-row (lambda (tot)
 			       (debug:print-info 0 *default-log-port* "Test records count after clean: " tot))
-			     count-stmt)))
+			     test-count-stmt)
+       (sqlite3:for-each-row (lambda (tot)
+			       (debug:print-info 0 *default-log-port* "Test_step records count after clean: " tot))
+			     step-count-stmt)))
     (map sqlite3:finalize! statements)
-    (sqlite3:finalize! count-stmt)
-    ;; (db:find-and-mark-incomplete db)
-    ;; (db:delay-if-busy dbdat)
+    (sqlite3:finalize! test-count-stmt)
+    (sqlite3:finalize! step-count-stmt)
     (sqlite3:execute db "VACUUM;")))
 
 ;; Clean out old junk and vacuum the database
 ;;
 ;; Ultimately do something like this: