@@ -327,10 +327,11 @@
 		 args:arg-hash
 		 0))
 
 ;; Add args that use remargs here
 ;;
+
 (if (and (not (null? remargs))
 	 (not (or
 	       (args:get-arg "-runstep")
 	       (args:get-arg "-envcap")
 	       (args:get-arg "-envdelta")
@@ -699,13 +700,11 @@
     ;; Server? Start up here.
     ;;
     (let ((tl        (launch:setup))
 	;; (run-id    (and (args:get-arg "-run-id")
 	;; 		  (string->number (args:get-arg "-run-id"))))
-          (transport-type (string->symbol (or (args:get-arg "-transport") "http"))))
-      ;; (if run-id
-      ;;   (begin
+          (transport-type *transport-type*  ))
       (server:launch 0 transport-type)
       (set! *didsomething* #t)))
 ;;     ;; (debug:print-error 0 *default-log-port* "server requires run-id be specified with -run-id")))
 ;; 
 ;;     ;; Not a server? This section will decide how to communicate
@@ -1985,11 +1984,10 @@
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
-(if *runremote* (close-all-connections!)) ;; for http-client
 
 (if (not *didsomething*)
     (debug:print 0 *default-log-port* help))
 
 (set! *time-to-exit* #t)