@@ -41,11 +41,14 @@
 (include "key_records.scm")
 (include "run_records.scm")
 
 (declare (uses rmtmod))
 (import rmtmod)
-
+(declare (uses dbmod))
+(import dbmod)
+(declare (uses commonmod))
+(import commonmod)
 
 (define *rundb-mutex* (make-mutex)) ;; prevent problems opening/closing rundb's
 (define *number-of-writes* 0)
 (define *number-non-write-queries* 0)
 
@@ -115,21 +118,10 @@
             ;; (stack-push! (dbr:dbstruct-dbstack dbstruct) newdb)
             newdb)
           (stack-pop! (dbr:dbstruct-dbstack dbstruct)))
       (db:open-db dbstruct)))
 
-;; ;; legacy handling of structure for managing db's. Refactor this into dbr:?
-(define (db:dbdat-get-db dbdat)
-  (if (pair? dbdat)
-      (car dbdat)
-      dbdat))
-
-(define (db:dbdat-get-path dbdat)
-  (if (pair? dbdat)
-      (cdr dbdat)
-      #f))
-
 ;; mod-read:
 ;;     'mod   modified data
 ;;     'read  read data
 ;; Locks the mutex and depending on 'mod or 'read passed, sets the last timestamp in dbstruct
 ;;