@@ -33,10 +33,15 @@
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses dbmod))
 (import dbmod)
+
+(declare (uses rmt))
+
+(declare (uses servermod))
+(import servermod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 ;; client:get-signature
@@ -101,21 +106,19 @@
 	      (debug:print-info 4 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
 	      (if (and (not area-dat)
 		       (not *runremote*))
                   (begin
 		    ;; POSSIBLE BUG. I removed the full initialization call. mrw
-		    (set! *runremote* (make-remote)) ;; (create-remote-record))
+		    (set! *runremote* (create-remote-record))
                     (let* ((server-info (remote-server-info *runremote*))) 
                       (if server-info
                         (begin
                           (remote-server-url-set! *runremote* (server:record->url server-info))
                           (remote-server-id-set! *runremote* (server:record->id server-info)))))))
 	      (if (and host port server-id)
-		  (let* ((start-res (case *transport-type*
-				      ((http)(http-transport:client-connect host port server-id))))
-			 (ping-res  (case *transport-type* 
-				      ((http)(rmt:login-no-auto-client-setup start-res)))))
+		  (let* ((start-res (http-transport:client-connect host port server-id))
+			 (ping-res  (rmt:login-no-auto-client-setup start-res)))
 		    (if (and start-res
 			     ping-res)
 			(let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago
 			  (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res)
 			  (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res))