@@ -501,14 +501,10 @@
 	       (work-area (assoc/default 'work-area cmdinfo))  ;; work-area is the test run area
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
 	       (subrun    (assoc/default 'subrun    cmdinfo))
-	       ;; (runremote (assoc/default 'runremote cmdinfo))
-	       ;; (transport (assoc/default 'transport cmdinfo))  ;; not used
-	       ;; (serverinf (assoc/default 'serverinf cmdinfo))
-	       ;; (port      (assoc/default 'port      cmdinfo))
 	       (serverurl (assoc/default 'serverurl cmdinfo))
 	       (homehost  (assoc/default 'homehost  cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (test-id   (assoc/default 'test-id   cmdinfo))
 	       (target    (assoc/default 'target    cmdinfo))
@@ -1626,12 +1622,12 @@
 					;; (list 'serverinf *server-info*)
 					(list 'homehost  (let* ((hhdat (common:get-homehost)))
 							   (if hhdat
 							       (car hhdat)
 							       #f)))
-					(list 'serverurl (if *runremote*
-							     (remote-server-url *runremote*)
+					(list 'serverurl (if *alldat* 
+							     (alldat-server-url *alldat*)
 							     #f)) ;;
 					(list 'areaname  (common:get-area-name *alldat*))
 					(list 'toppath   *toppath*)
 					(list 'work-area work-area)
 					(list 'test-name test-name)