@@ -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