Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -294,11 +294,11 @@
     (thread-sleep! 3)
     (if (and rundb
 	     (sqlite3:database? rundb))
 	(handle-exceptions
 	 exn
-	 (debug:print 0 "WARNING: database files may not have been closed correctly. Consider running -cleanup-db")
+	 #t ;; (debug:print 0 "WARNING: database files may not have been closed correctly. Consider running -cleanup-db")
 	 (sqlite3:interrupt! rundb)
 	 (sqlite3:finalize! rundb #t)))))
 
 (define (db:open-inmem-db)
   (let* ((db      (sqlite3:open-database ":memory:"))
@@ -853,11 +853,11 @@
 ;; 2. Look at run records
 ;;    a. If have tests that are not deleted, set state='unknown'
 ;;    b. ....
 ;;
 (define (db:clean-up db)
-  (debug:print 0 "WARNING: db clean up not ported to v1.60, cleanup action will be on megatest.db")
+  (debug:print 0 "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db")
   (let* (;; (db         (db:get-db dbstruct #f))
 	 (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests)+(SELECT count(id) FROM runs);"))
 	(statements
 	 (map (lambda (stmt)
 		(sqlite3:prepare db stmt))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1219,11 +1219,20 @@
       (if (not (launch:setup-for-run))
 	  (begin
 	    (debug:print 0 "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
-      (open-run-close db:clean-up #f)
+      ;; (open-run-close db:clean-up #f)
+      (db:multi-db-sync 
+       #f ;; do all run-ids
+       'new2old
+       'killservers
+       'dejunk
+       'adj-testids
+       'old2new
+       'new2old
+       )
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
       (if (not (launch:setup-for-run))