Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2451,32 +2451,16 @@
      #f
      (lambda (dbdat db)
        (let* ((stmth (db:get-cache-stmth dbdat db qry)))
 	 (sqlite3:first-result stmth))))))
 
-;; NEW BEHAVIOR: Count tests running in only one run!
-;;
-(define (db:get-count-tests-actually-running dbstruct run-id)
-  (db:with-db
-   dbstruct
-   run-id
-   #f
-   (lambda (dbdat db)
-     (sqlite3:first-result
-      db
-      ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ...
-      ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted') AND NOT (uname = 'n/a' AND item_path = '');")
-      "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART','LAUNCHED') AND run_id=?;" 
-      run-id)))) ;; NOT IN (SELECT id FROM runs WHERE state='deleted');")
 
 ;; NEW BEHAVIOR: Look only at single run with run-id
 ;; 
 ;; (define (db:get-running-stats dbstruct run-id)
 (define (db:get-count-tests-running-for-run-id dbstruct run-id) ;; fastmode)
-  (let* ((qry ;; (if fastmode
-		 ;;  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? LIMIT 1;"
-		  "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;")) ;; )
+  (let* ((qry "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;"))
     (db:with-db
      dbstruct
      run-id
      #f
      (lambda (dbdat db)