@@ -135,11 +135,11 @@
 	  mutils
 	  autoload
 	  cookie
 	  csv-xml
 	  ducttape-lib
-	  mtargs
+	  (prefix mtargs args:)
 	  pkts
 	  stml2
 	  (prefix dbi dbi:)
 
 	  apimod
@@ -163,84 +163,29 @@
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 (define setenv set-environment-variable!)
 (define unsetenv unset-environment-variable!)
 
-;; (declare (uses common))
-;; ;; (declare (uses megatest-version))
-;; (declare (uses margs))
-;; (declare (uses runs))
-;; (declare (uses launch))
-;; (declare (uses server))
-;; (declare (uses client))
-;; (declare (uses tests))
-;; (declare (uses genexample))
-;; ;; (declare (uses daemon))
-;; (declare (uses db))
-;; ;; (declare (uses dcommon))
-;; 
-;; (declare (uses tdb))
-;; (declare (uses mt))
-;; (declare (uses api))
-;; (declare (uses tasks)) ;; only used for debugging.
-;; (declare (uses env))
-;; (declare (uses diff-report))
-;; (declare (uses ftail))
-;; (import ftail)
-
-;; (define (blahblah)(thread-sleep! 1.234))
-
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
-(include "common_records.scm")
-(include "key_records.scm")
-(include "db_records.scm")
-(include "run_records.scm")
-(include "test_records.scm")
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "run_records.scm")
+;; (include "test_records.scm")
 
 (include "common.scm")
-;; (include "megatest-fossil-hash.scm")
-
-(include "configf.scm")
-(include "margs.scm")
-(include "process.scm")
-(include "keys.scm")
-(include "portlogger.scm")
+;; (include "margs.scm")
 (include "db.scm")
-(include "rmt.scm")
-(include "runs.scm")
-(include "launch.scm")
 (include "server.scm")
-(include "client.scm")
 (include "tests.scm")
-(include "items.scm")
-(include "subrun.scm")
 (include "genexample.scm")
 (include "tdb.scm")
-(include "mt.scm")
-(include "api.scm")
-(include "tasks.scm")
-(include "ezsteps.scm")
 (include "env.scm")
 (include "diff-report.scm")
-(include "cgisetup/models/pgdb.scm")
-(include "runconfig.scm")
-(include "archive.scm")
 (include "ods.scm")
-(include "http-transport.scm")
-
-;;;      ;; (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
-;;;      ;;      readline apropos json http-client directory-utils typed-records
-;;;      ;;      http-client srfi-18 extras format)
-;;;      
-;;;      ;; Added for csv stuff - will be removed
-;;;      ;;
-;;;      ;; (use sparse-vectors)
-;;;      ;; 
-;;;      ;; (require-library mutils)
-;;;      
-     
+
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
 
 ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
 ;;