Index: launchmod.scm
==================================================================
--- launchmod.scm
+++ launchmod.scm
@@ -23,21 +23,20 @@
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses csv-xml))
 (declare (uses dbmod))
 (declare (uses debugprint))
+(declare (uses ezstepsmod))
 (declare (uses keysmod))
 (declare (uses mtargs))
 (declare (uses mtmod))
 (declare (uses mtver))
 (declare (uses processmod))
 (declare (uses rmtmod))
 (declare (uses servermod))
-(declare (uses testsmod))
-(declare (uses ezstepsmod))
 (declare (uses subrunmod))
-;; (declare (uses servermod))
+(declare (uses testsmod))
 
 (module launchmod
 	*
 	
 (import scheme
@@ -84,20 +83,19 @@
 	(prefix mtargs args:)
 	commonmod
 	configfmod
 	dbmod
 	debugprint
+	ezstepsmod
 	keysmod
 	mtmod
 	mtver
 	processmod
 	rmtmod
 	servermod
-	testsmod
-	ezstepsmod
 	subrunmod
-	;; (import servermod)
+	testsmod
 	)
 
 (include "db_records.scm")
 (include "key_records.scm")
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -14,11 +14,10 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(declare (uses autoload))
 (declare (uses dbi))
 (declare (uses pkts))
 (declare (uses stml2))
 (declare (uses cookie))
 (declare (uses csv-xml))
@@ -116,20 +115,19 @@
 	  csv-xml
 	  ducttape-lib
 	  hostinfo
 	  mtver
 	  mutils
-	  autoload
 	  cookie
 	  csv-xml
 	  ducttape-lib
 	  (prefix mtargs args:)
 	  pkts
 	  stml2
 	  (prefix dbi dbi:)
 
-	  apimod
+	  ;; apimod
 	  archivemod
 	  commonmod
 	  configfmod
 	  dbmod
 	  debugprint
@@ -138,11 +136,11 @@
 	  launchmod
 	  processmod
 	  rmtmod
 	  runsmod
 	  servermod
-	  tasksmod
+	  ;; tasksmod
 	  testsmod
 	  
 	  )
 	
 ;; fake out readline usage of toplevel-command