@@ -2434,11 +2434,11 @@
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
       ;; (open-run-close patch-db #f)
-      (let ((dbstructs (db:setup #f)))
+      (let ((dbstructs (db:setup)))
         (common:cleanup-db dbstructs full: #t))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
@@ -2511,11 +2511,11 @@
     (let* ((toppath (launch:setup))
 	   (dbstructs (if (and toppath
 			       ;; NOTE: server:choose-server is starting a server
 			       ;;   either add equivalent for tcp mode or ????
                                #;(server:choose-server toppath 'home?))
-                          (db:setup #t)
+                          (db:setup)
                           #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")
 	    ;; How to run megatest scripts
@@ -2602,11 +2602,11 @@
 
 (if (args:get-arg "-import-megatest.db")
     (begin
       (launch:setup)
       (db:multi-db-sync 
-       (db:setup #f)
+       (db:setup)
        'killservers
        'dejunk
        'adj-testids
        'old2new
        )
@@ -2618,11 +2618,11 @@
       (rmt:import-sexpr (args:get-arg "-import-sexpr"))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-sync-to-megatest.db")
     (let* ((duh      (launch:setup))
-	   (dbstruct (db:setup #t))
+	   (dbstruct (db:setup))
 	   (tmpdbpth (dbr:dbstruct-tmppath dbstruct))
 	   (lockfile (conc tmpdbpth ".lock"))
 	   (locked   (common:simple-file-lock lockfile)) 
 	   (res      (if locked
 			 (db:multi-db-sync