Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -829,21 +829,10 @@
                  (item-path (vector-ref running-test 11)))
 			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
               (if (not (null? tal))
 		  (loop (car tal) (cdr tal)))))))))))
 
-;; replaced below with version that does not ssh if checking on localhost
-#;(define (launch:is-test-alive host pid)
-  (if (and host pid (not (equal? host "n/a")))
-      (let* ((cmd (conc "ssh " host " pstree -A " pid))
-	     (output (with-input-from-pipe cmd read-lines)))
-	(debug:print 2 *default-log-port* "Running " cmd " received " output)
-	(if (eq? (length output) 0)
-	   #f
-	   #t))
-      #t))
-
 (define (launch:kill-tests-if-dead run-id)
   (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
        (let loop ((running-test (car running-tests))
 			     (tal    (cdr running-tests))
 			     (kill-cnt 0))
@@ -854,11 +843,11 @@
                  (pid  (rmt:test-get-top-process-pid run-id test-id))   
                  (event-time (vector-ref running-test 5))
                  (duration (vector-ref running-test 12))
                  (flag 0)   
                  (curr-time (current-seconds)))
-       (if (and (< (+ event-time duration 600) curr-time) (not (launch:is-test-alive host pid))) ;;test has not updated duration in last 10 min then likely its not running but confirm before marking it as killed
+       (if (and (< (+ event-time duration 600) curr-time) (not (commonmod:is-test-alive host pid))) ;;test has not updated duration in last 10 min then likely its not running but confirm before marking it as killed
            (begin    
 			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " needs to be killed")
               (set! flag 1) 
               (rmt:set-state-status-and-roll-up-items run-id test-name item-path "KILLREQ" "n/a" #f)))
                (if (not (null? tal))