@@ -271,11 +271,10 @@
 ;;     db))
 
 ;; This routine creates the db if not already present. It is only called if the db is not already opened
 ;;
 (define (db:open-db dbstruct #!key (areapath #f))
-  (print (db:open-megatest-db path: (db:dbfile-path)))
   (let ((tmpdb (dbr:dbstruct-tmpdb dbstruct))) ;; RA => Returns the first reference in dbstruct
     (if tmpdb
 	tmpdb
         ;; (mutex-lock! *rundb-mutex*)
         (let* ((dbpath       (db:dbfile-path)) ;;  0))
@@ -1676,11 +1675,10 @@
 
 ;; returns number if string->number is successful, string otherwise
 ;; also updates *global-delta*
 ;;
 (define (db:get-var dbstruct var)
-  (print dbstruct var)
   (let* ((res      #f)
 	 (dbdat    (db:get-db dbstruct #f))
 	 (db       (db:dbdat-get-db dbdat)))
     (dbi:for-each-row
      (lambda (val)
@@ -1722,11 +1720,10 @@
 
 ;; why get the keys from the db? why not get from the *configdat*
 ;; using keys:config-get-fields?
 
 (define (db:get-keys dbstruct)
-  (print dbstruct)
   (if *db-keys* *db-keys* 
       (let ((res '()))
 	(db:with-db dbstruct #f #f
 		    (lambda (db)
 		      (dbi:for-each-row 
@@ -1764,11 +1761,10 @@
    #f ;; does not modify db
    (lambda (db)
      (let ((res #f))
        (dbi:for-each-row
 	(lambda (runname)
-    (print runname)
 	  (set! res runname))
 	db
 	"SELECT runname FROM runs WHERE id=?;"
 	run-id)
        res))))
@@ -1780,11 +1776,10 @@
    #f
    (lambda (db)
      (let ((res #f))
        (dbi:for-each-row
 	(lambda (val)
-    (print val)
 	  (set! res val))
 	db
 	(conc "SELECT " key " FROM runs WHERE id=?;")
 	run-id)
        res))))
@@ -3251,27 +3246,27 @@
 ;;    ;; 	    ((ABORT INCOMPLETE) (db:general-call dbdat 'top-test-set (list status test-name))))
 ;;    ;; 	  #f)
 ;;    ;; 	)))
 
 (define (db:get-all-state-status-counts-for-test db run-id test-name item-path)
-  (sqlite3:map-row
+  (dbi:map-row
    (lambda (state status count)
      (make-dbr:counts state: state status: status count: count))
    db
    "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;"
    run-id test-name item-path))
 
 
 (define (db:get-all-item-states db run-id test-name)
-  (sqlite3:map-row 
+  (dbi:map-row 
    (lambda (a) a)
    db
    "SELECT DISTINCT state FROM tests WHERE item_path != '' AND state != 'DELETED' AND run_id=? AND testname=?"
    run-id test-name))
 
 (define (db:get-all-item-statuses db run-id test-name)
-  (sqlite3:map-row 
+  (dbi:map-row 
    (lambda (a) a)
    db
    "SELECT DISTINCT status FROM tests WHERE item_path != '' AND state != 'DELETED' AND state='COMPLETED' AND run_id=? AND testname=?"
    run-id test-name))