@@ -314,72 +314,10 @@
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================
 
-;; Just some syntatic sugar
-(define (rmt:register-test run-id test-name item-path)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:general-call 'register-test run-id run-id test-name item-path))
-
-(define (rmt:get-test-id run-id testname item-path)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'get-test-id run-id (list run-id testname item-path)))
-
-(define (rmt:get-test-info-by-id run-id test-id)
-  (if (number? test-id)
-      (rmt:send-receive 'get-test-info-by-id run-id (list run-id test-id))
-      (begin
-	(debug:print 0 *default-log-port* "WARNING: Bad data handed to rmt:get-test-info-by-id run-id=" run-id ", test-id=" test-id)
-	(print-call-chain (current-error-port))
-	#f)))
-
-(define (rmt:get-test-state-status-by-id run-id test-id)
-  (rmt:send-receive 'get-test-state-status-by-id run-id (list run-id test-id)))
-
-(define (rmt:test-get-rundir-from-test-id run-id test-id)
-  (rmt:send-receive 'test-get-rundir-from-test-id run-id (list run-id test-id)))
-
-(define (rmt:open-test-db-by-test-id run-id test-id #!key (work-area #f))
-  (assert (number? run-id) "FATAL: Run id required.")
-  (let* ((test-path (if (string? work-area)
-			work-area
-			(rmt:test-get-rundir-from-test-id run-id test-id))))
-    (debug:print 3 *default-log-port* "TEST PATH: " test-path)
-    (open-test-db test-path)))
-
-;; WARNING: This currently bypasses the transaction wrapped writes system
-(define (rmt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'test-set-state-status-by-id run-id (list run-id test-id newstate newstatus newcomment)))
-
-(define (rmt:set-tests-state-status run-id testnames currstate currstatus newstate newstatus)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus)))
-
-(define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
-  (assert (number? run-id) "FATAL: Run id required.")
-  ;; (if (number? run-id)
-  (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)))
-  ;;    (begin
-  ;;	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
-  ;;	(print-call-chain (current-error-port))
-  ;;	'())))
-
-(define (rmt:get-tests-for-run-state-status run-id testpatt last-update)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'get-tests-for-run-state-status run-id (list run-id testpatt last-update)))
-
-;; get stuff via synchash 
-(define (rmt:synchash-get run-id proc synckey keynum params)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
-
-(define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
-  
 ;; IDEA: Threadify these - they spend a lot of time waiting ...
 ;;
 (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
   (let ((multi-run-mutex (make-mutex))
 	(run-id-list (if run-ids
@@ -501,16 +439,10 @@
 
 (define (rmt:get-count-tests-running-in-jobgroup run-id jobgroup)
   (assert (number? run-id) "FATAL: Run id required.")
   (rmt:send-receive 'get-count-tests-running-in-jobgroup run-id (list run-id jobgroup)))
 
-;; state and status are extra hints not usually used in the calculation
-;;
-(define (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status comment)
-  (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'set-state-status-and-roll-up-items run-id (list run-id test-name item-path state status comment)))
-
 (define (rmt:set-state-status-and-roll-up-run run-id state status)
   (assert (number? run-id) "FATAL: Run id required.")
   (rmt:send-receive 'set-state-status-and-roll-up-run run-id (list run-id state status)))
 
 
@@ -831,5 +763,15 @@
 		 (tt-ro-mode-set! runremote ro-mode)
 		 (tt-ro-mode-checked-set! runremote #t)
 		 ro-mode)
 	       ro-mode))))))
 
+;;======================================================================
+;; Maintenance
+;;======================================================================
+
+(define (rmt:find-and-mark-incomplete run-id ovr-deadtime)
+  (let* ((cfg-deadtime             (configf:lookup-number *configdat* "setup" "deadtime"))
+	 (test-stats-update-period (configf:lookup-number *configdat* "setup" "test-stats-update-period")))
+   (rmt:find-and-mark-incomplete-engine run-id ovr-deadtime cfg-deadtime test-stats-update-period)
+   ;;call end of eud of run detection for posthook
+   (launch:end-of-run-check run-id)))