Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -18,11 +18,11 @@
 
 ;;======================================================================
 
 (declare (unit commonmod))
 (declare (uses mtargs))
-(declare (uses stml2))m
+(declare (uses stml2))
 	 
 (module commonmod
 	*
 	
 (import scheme chicken data-structures extras)
@@ -36,13 +36,12 @@
 	md5
 	message-digest
 	(prefix mtconfigf configf:)
 	stml2
 	;; (prefix margs args:)
-	z3 (prefix base64 base64:))
-
-(import (prefix mtargs args:))
+	z3 (prefix base64 base64:)
+	(prefix mtargs args:))
 
 (include "common_records.scm")
 (include "megatest-fossil-hash.scm")
 (include "megatest-version.scm")
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -77,11 +77,10 @@
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
-;; (include "megatest-fossil-hash.scm") ;; comes from megamod
 (include "vg_records.scm")
 
 ;; invoke the imports
 (declare (uses commonmod.import))
 (declare (uses testsmod.import))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -30,25 +30,10 @@
 ;;
 (use sparse-vectors)
 
 (require-library mutils)
 
-;; (use zmq)
-
-;; (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 commonmod))
 (import commonmod)
 (declare (uses rmtmod))
 (import rmtmod)
 (declare (uses dbmod))

Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -18,22 +18,22 @@
 
 ;;======================================================================
 
 (declare (unit testsmod))
 (declare (uses commonmod))
+(declare (uses mtargs))
 
 (module testsmod
 	*
 	
 (import scheme chicken data-structures extras)
 
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable
 	(prefix mtconfigf configf:)
 	regex srfi-13
-	)
-(import commonmod)
-;; (use (prefix ulex ulex:))
+	commonmod
+	(prefix mtargs args:))
 
 (define *java-script-lib* #f)
 
 (define (init-java-script-lib)
   (set! *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))