Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -41,16 +41,18 @@
 (define (client:logout serverdat)
   (let ((ok (and (socket? serverdat)
 		 (cdb:logout serverdat *toppath* (client:get-signature)))))
     ok))
 
-(define (client:connect iface port)
-  (case (server:get-transport)
-    ((rpc)  (rpc:client-connect  iface port))
-    ((http) (http:client-connect iface port))
-    ((zmq)  (zmq:client-connect  iface port))
-    (else   (rpc:client-connect  iface port))))
+;; BB: commenting out orphan code
+;;;;;
+;; (define (client:connect iface port)
+;;   (case (server:get-transport)
+;;     ((rpc)  (rpc:client-connect  iface port))
+;;     ((http) (http:client-connect iface port))
+;;     ((zmq)  (zmq:client-connect  iface port))
+;;     (else   (rpc:client-connect  iface port))))
 
 (define (client:setup  run-id #!key (remaining-tries 10))
   (debug:print-info 2 *default-log-port* "client:setup remaining-tries=" remaining-tries)
   (let* ((server-dat (tasks:bb-get-server-info run-id))
          (transport (if server-dat (tasks:hostinfo-get-transport server-dat) 'noserver)))
@@ -66,11 +68,11 @@
                (if (< num-available 2)
                    (server:try-running run-id))
                (thread-sleep! (+ 5 (random (- 20 remaining-tries))))  ;; give server a little time to start up, randomize a little to avoid start storms.
                (client:setup run-id remaining-tries: (- remaining-tries 1))))))
       ((http)(client:setup-http server-dat run-id remaining-tries))
-      ((rpc) (rpc-transport:client-setup run-id)) ;;(client:setup-rpc run-id))
+      ;; ((rpc) (rpc-transport:client-setup run-id)) ;;(client:setup-rpc run-id)) rpc not implemented;  want to see a failure here for now.
       (else
        (debug:print-error 0 *default-log-port* "Unknown transport ["
                           transport "] specified used by server for run-id " run-id)
        (exit 1)))))
 
@@ -199,15 +201,16 @@
 ;; client:setup
 ;;
 ;; lookup_server, need to remove *runremote* stuff
 ;;
 
-
-;; keep this as a function to ease future 
-(define (client:start run-id server-info)
-  (http-transport:client-connect (tasks:hostinfo-get-interface server-info)
-				 (tasks:hostinfo-get-port server-info)))
+;; BB: commenting out orphan code.  
+;;
+;; ;; keep this as a function to ease future 
+;; (define (client:start run-id server-info)
+;;   (http-transport:client-connect (tasks:hostinfo-get-interface server-info)
+;; 				 (tasks:hostinfo-get-port server-info)))
 
 ;; ;; client:signal-handler
 ;; (define (client:signal-handler signum)
 ;;   (signal-mask! signum)
 ;;   (set! *time-to-exit* #t)

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -71,16 +71,17 @@
                     (configf:lookup *configdat* "server" "transport")
                     "http"))))
     (set! *transport-type* ttype)
     ttype))
 
-;; Get the transport
-(define (server:get-transport #!key (run-id #f)) ;; BB> BBTODO Shouldn't this be run-id sensitive and not a global?? (added run-id key to get this is we are supplied a run-id (added this in client:setup)
-  (if *transport-type*
-      *transport-type*
-      (server:set-transport)))
-	    
+;; Get the transport  -- DO NOT call this from client code.  In client code, this is run-id sensitive and not a global
+
+ (define (server:get-transport)
+   (if *transport-type*
+       *transport-type*
+       (server:set-transport)))
+
 ;; Generate a unique signature for this server
 (define (server:mk-signature)
   (message-digest-string (md5-primitive) 
 			 (with-output-to-string
 			   (lambda ()