@@ -585,11 +585,11 @@
 (if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
     (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
 
 ;; some switches imply homehost. Exit here if not on homehost
 ;;
-(let ((homehost-required  (list "-cleanup-db" "-server")))
+#;(let ((homehost-required  (list "-cleanup-db" "-server")))
   (if (apply args:any? homehost-required)
       (if (not (common:on-homehost?))
 	  (for-each
 	   (lambda (switch)
 	     (if (args:get-arg switch)
@@ -2196,11 +2196,11 @@
 (if (or (getenv "MT_RUNSCRIPT")
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
 	   (dbstruct (if (and toppath
-                              (common:on-homehost?))
+                              #;(common:on-homehost?))
                          (db:setup #t)
                          #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")