@@ -88,12 +88,10 @@
 	servermod
 	)
 
 (include "megatest-version.scm")
 (include "common_records.scm")
-;; (include "db_records.scm")
-;; (include "key_records.scm")
 (include "run_records.scm")
 
 ;; yes, this is non-ideal 
 (define dashboard:update-summary-tab #f)
 (define dashboard:update-servers-table #f)
@@ -6288,11 +6286,12 @@
   (let* ((mtdb-path (conc *toppath* "/.mtdb/main.db"))
          (target (args:get-arg "-target"))
          (commondat       (dboard:commondat-make)))
     (if target
         (begin
-          (args:remove-arg-from-ht "-target")
+          ;; (args:remove-arg-from-ht "-target") ;; we have old versions of mtargs installed as eggs - uncomment this when going to chicken 5 BUG
+	  (hash-table-delete! args:arg-hash "-target")
           (dboard:commondat-target-set! commondat target)
         )
     )
 
     (if (not (launch:setup))