@@ -39,11 +39,11 @@
 ;;
 ;; Use: (db-get-value-by-header (db:get-header runinfo)(db:get-row runinfo))
 ;;  to extract info from the structure returned
 ;;
 (define (mt:get-runs-by-patt keys runnamepatt targpatt)
-  (let loop ((runsdat  (cdb:remote-run db:get-runs-by-patt #f keys runnamepatt targpatt 0 500))
+  (let loop ((runsdat  (rmt:get-runs-by-patt keys runnamepatt targpatt 0 500))
 	     (res      '())
 	     (offset   0)
 	     (limit    500))
     ;; (print "runsdat: " runsdat)
     (let* ((header    (vector-ref runsdat 0))
@@ -51,11 +51,11 @@
 	   (full-list (append res runslst))
 	   (have-more (eq? (length runslst) limit)))
       ;; (debug:print 0 "header: " header " runslst: " runslst " have-more: " have-more)
       (if have-more 
 	  (let ((new-offset (+ offset limit))
-		(next-batch (cdb:remote-run db:get-runs-by-patt #f keys runnamepatt targpatt offset limit)))
+		(next-batch (rmt:get-runs-by-patt keys runnamepatt targpatt offset limit)))
 	    (debug:print-info 4 "More than " limit " runs, have " (length full-list) " runs so far.")
 	    (debug:print-info 0 "next-batch: " next-batch)
 	    (loop next-batch
 		  full-list
 		  new-offset
@@ -80,13 +80,10 @@
 		  full-list
 		  new-offset
 		  limit))
 	  full-list))))
 
-(define (mt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
-  (db:get-prereqs-not-met run-id waitons ref-item-path mode: mode))
-
 (define (mt:lazy-get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
   (let* ((key    (list run-id waitons ref-item-path mode))
 	 (res    (hash-table-ref/default *pre-reqs-met-cache* key #f))
 	 (useres (let ((last-time (if (vector? res) (vector-ref res 0) #f)))
 		   (if last-time
@@ -94,16 +91,17 @@
 		       #f))))
     (if useres
 	(let ((result (vector-ref res 1)))
 	  (debug:print 4 "Using lazy value res: " result)
 	  result)
-	(let ((newres (db:get-prereqs-not-met run-id waitons ref-item-path mode: mode)))
+	(let ((newres (rmt:get-prereqs-not-met run-id waitons ref-item-path mode: mode)))
 	  (hash-table-set! *pre-reqs-met-cache* key (vector (current-seconds) newres))
 	  newres))))
 
+;;  Get run stats from local access, move this ... but where?
 (define (mt:get-run-stats)
-  (cdb:remote-run db:get-run-stats #f))
+  (db:get-run-stats #f))
 
 (define (mt:discard-blocked-tests run-id failed-test tests test-records)
   (if (null? tests)
       tests
       (begin
@@ -126,11 +124,11 @@
 ;;======================================================================
 ;;  T R I G G E R S
 ;;======================================================================
 
 (define (mt:process-triggers test-id newstate newstatus)
-  (let* ((test-dat      (mt:lazy-get-test-info-by-id test-id))
+  (let* ((test-dat      (rmt:get-test-info-by-id test-id))
 	 (test-rundir   (db:test-get-rundir test-dat))
 	 (test-name     (db:test-get-testname test-dat))
 	 (tconfig       #f)
 	 (state         (if newstate  newstate  (db:test-get-state  test-dat)))
 	 (status        (if newstatus newstatus (db:test-get-status test-dat))))
@@ -157,21 +155,10 @@
 
 ;;======================================================================
 ;;  S T A T E   A N D   S T A T U S   F O R   T E S T S 
 ;;======================================================================
 
-(define (mt:roll-up-pass-fail-counts run-id test-name item-path status)
-  (if (and (not (equal? item-path ""))
-	   (member status '("PASS" "WARN" "FAIL" "WAIVED" "RUNNING" "CHECK" "SKIP")))
-      (begin
-	(cdb:update-pass-fail-counts *runremote* run-id test-name)
-	(if (equal? status "RUNNING")
-	    (cdb:top-test-set-running *runremote* run-id test-name)
-	    (cdb:top-test-set-per-pf-counts *runremote* run-id test-name))
-	#f)
-      #f))
-
 ;; speed up for common cases with a little logic
 (define (mt:test-set-state-status-by-id test-id newstate newstatus newcomment)
   (cond
    ((and newstate newstatus newcomment)
     (cdb:client-call *runremote* 'state-status-msg #t *default-numtries* newstate newstatus newcomment test-id))