Index: launchmod.scm
==================================================================
--- launchmod.scm
+++ launchmod.scm
@@ -19,16 +19,10 @@
 ;;======================================================================
 
 (declare (unit launchmod))
 
 (declare (uses commonmod))
-;; (declare (uses rmtmod))
-;; (declare (uses mtconfigf))
-;; (declare (uses testsmod))
-;; (declare (uses mtargs))
-;; (declare (uses subrunmod))
-;; (declare (uses dbmod))
 
 (module launchmod
 	*
 	
 (import scheme chicken data-structures extras files)
@@ -35,18 +29,7 @@
 (import (prefix sqlite3 sqlite3:) posix typed-records
 	srfi-18 srfi-69 format ports srfi-1 matchable
 	z3 (prefix base64 base64:) regex
 	call-with-environment-variables csv)
 (import commonmod)
-;; (import rmtmod)
-;; (import (prefix mtconfigf configf:))
-;; (import testsmod)
-;; (import (prefix mtargs args:))
-;; (import subrunmod)
-;; (import dbmod)
-;; 
-;; ;; (use (prefix ulex ulex:))
-;; 
-;; (include "common_records.scm")
-;; (include "db_records.scm")
-;; (include "run_records.scm")
+
 )

Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -39,22 +39,10 @@
 (declare (uses tasksmod))
 (declare (uses testsmod))
 (declare (uses subrunmod))
 (declare (uses itemsmod))
 (declare (uses runsmod))
-;; (declare (uses archivemod))
-;; (declare (uses clientmod))
-;; (declare (uses dcommonmod))
-;; (declare (uses envmod))
-;; (declare (uses ezstepsmod))
-;; (declare (uses ftail))
-;; (declare (uses keysmod))
-;; (declare (uses launchmod))
-;; (declare (uses processmod))
-;; (declare (uses runconfigmod))
-;; (declare (uses subrunmod))
-;; (declare (uses vgmod))
 
 (module megamod
 	*
 	
 (import scheme chicken data-structures extras)
@@ -131,23 +119,10 @@
 (import testsmod)
 (import servermod)
 (import subrunmod)
 (import itemsmod)
 (import runsmod)
-;; (import archivemod)
-;; (import clientmod)
-;; (import dcommonmod)
-;; (import envmod)
-;; (import ezstepsmod)
-;; (import ftail)
-;; (import keysmod)
-;; (import launchmod)
-;; (import odsmod)
-;; (import processmod)
-;; (import runconfigmod)
-;; (import subrunmod)
-;; (import vgmod)
 
 ;; (use (prefix ulex ulex:))
 
 (include "common_records.scm")
 (include "db_records.scm")
@@ -185,29 +160,9 @@
 (include "client-inc.scm")
 (include "env-inc.scm")
 (include "portlogger-inc.scm")
 (include "process-inc.scm")    ;; L6
 (include "runconfig-inc.scm")
-;; (include "api-inc.scm")       ;; L3 
-;; (include "common-inc.scm")    ;; L5
-;; (include "db-inc.scm")        ;; L4
-;; (include "http-transport-inc.scm")
-;; (include "items-inc.scm")
-;; (include "keys-inc.scm")
-;; (include "launch-inc.scm")     ;; L1
-;; (include "margs-inc.scm")
-;; (include "mt-inc.scm")
-;; (include "ods-inc.scm")        ;; L1
-;; (include "pgdb-inc.scm")
-;; (include "rmt-inc.scm")        ;; L2
-;; (include "runs-inc.scm")       ;; L1.5
-;; (include "server-inc.scm")
-;; (include "subrun-inc.scm")
-;; (include "tasks-inc.scm")
-;; (include "tdb-inc.scm")
-;; (include "tests-inc.scm")
-
-;; (include "js-path.scm") ;; moved into init procedure in tests-inc.scm
 
 )
 ;; http-transport:server-dat definition moved to common_records.scm
 ;; bunch of small functions factored out of send-receive to make debug easier