@@ -27,10 +27,13 @@
 (declare (uses commonmod))
 (import commonmod)
 
 (declare (uses apimod))
 (import apimod)
+
+(declare (uses rmtmod))
+(import rmtmod)
 
 (include "common_records.scm")
 ;; (declare (uses rmtmod))
 
 ;; (import rmtmod)
@@ -61,10 +64,18 @@
 		  (client:setup areapath)
 		  #f))))
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
+(define (create-remote-record)
+  (let ((rr (make-remote)))
+    (remote-hh-dat-set!         rr (common:get-homehost)) ;
+    (remote-server-info-set!    rr (if *toppath* (server:check-if-running *toppath*) #f))
+    (remote-transport-set!      rr *transport-type*)
+    (remote-server-timeout-set! rr (server:expiration-timeout))
+    rr))
+  
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
 ;;
 (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
 
   #;(common:telemetry-log (conc "rmt:"(->string cmd))
@@ -106,11 +117,11 @@
     ;; DOT MUTEXLOCK -> INIT_RUNREMOTE [label="no remote?"];
     ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
     ;; ensure we have a record for our connection for given area
     (if (not runremote)                   ;; can remove this one. should never get here.         
 	(begin
-	  (set! *runremote* (make-remote))
+	  (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)))))  
@@ -187,11 +198,11 @@
      ;; on homehost and this is a write, we already have a server, but server has died
      ((and (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote)             ;; have a server
            (not (server:ping (remote-server-url runremote) (remote-server-id runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
-      (set! *runremote* (make-remote))
+      (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)))))
@@ -972,24 +983,10 @@
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
 
 (define (rmt:test-get-archive-block-info archive-block-id)
   (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
 
-
-(define (rmtmod:calc-ro-mode runremote *toppath*)
-  (if (and runremote
-	   (remote-ro-mode-checked runremote))
-      (remote-ro-mode runremote)
-      (let* ((dbfile  (conc *toppath* "/megatest.db"))
-	     (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
-	(if runremote
-	    (begin
-	      (remote-ro-mode-set! runremote ro-mode)
-	      (remote-ro-mode-checked-set! runremote #t)
-	      ro-mode)
-	    ro-mode))))
-
 (define (extras-readonly-mode rmt-mutex log-port cmd params)
   (mutex-unlock! rmt-mutex)
   (debug:print-info 12 log-port "rmt:send-receive, case 3")
   (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
   #f)