Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -26,12 +26,12 @@
 
 SHELL=/bin/bash
 PREFIX=$(PWD)
 CSCOPTS=
 INSTALL=install
-SRCFILES = common.scm items.scm launch.scm ods.scm runconfig.scm	\
-           server.scm configf.scm db.scm keys.scm		\
+SRCFILES = common.scm items.scm launch.scm runconfig.scm	\
+           server.scm configf.scm keys.scm		\
            process.scm runs.scm genexample.scm	\
            tdb.scm mt.scm	\
            ezsteps.scm api.scm		\
            subrun.scm archive.scm env.scm		\
            diff-report.scm
@@ -164,11 +164,10 @@
 # 	items.o \
 # 	keys.o \
 # 	launch.o \
 # 	margs.o \
 # 	mt.o \
-# 	ods.o \
 # 	process.o \
 # 	rmt.o \
 # 	runconfig.o \
 # 	runs.o \
 # 	server.o \
@@ -229,11 +228,11 @@
 # 	make $(MOIMPFILES)
 # 	touch mofiles-made
 
 megatest.o : megatest-fossil-hash.scm megatest-version.scm $(MOFILES) $(MOIMPFILES)
 
-common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tree.scm : common_records.scm megatest-version.scm
+common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm dcommon.scm ezsteps.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tree.scm : common_records.scm megatest-version.scm
 
 common_records.scm : altdb.scm
 
 mofiles/dbfile.o : mofiles/commonmod.o
 

Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -17,11 +17,10 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
 (declare (unit api))
-(declare (uses db))
 (declare (uses apimod))
 
 (declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses dbmod))

Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -17,11 +17,10 @@
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (declare (unit archive))
-(declare (uses db))
 (declare (uses debugprint))
 (declare (uses mtargs))
 (declare (uses common))
 (declare (uses commonmod))
 (declare (uses configfmod))

Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ dashboard-context-menu.scm
@@ -25,11 +25,10 @@
 
 (declare (unit dashboard-context-menu))
 (declare (uses common))
 (declare (uses commonmod))
 (declare (uses configfmod))
-(declare (uses db))
 (declare (uses gutils))
 (declare (uses rmtmod))
 (declare (uses ezsteps))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))

Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -32,11 +32,10 @@
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit dashboard-guimonitor))
 (declare (uses common))
 (declare (uses keys))
-(declare (uses db))
 (declare (uses commonmod))
 (import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -34,11 +34,10 @@
 (declare (uses tasksmod))
 (declare (uses testsmod))
 
 (declare (uses dcommon))
 (declare (uses gutils))
-(declare (uses db))
 (declare (uses ezsteps))
 (declare (uses subrun))
 (declare (uses runsmod))
 (declare (uses subrunmod))
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -69,11 +69,10 @@
 
 (declare (uses configf))
 (declare (uses common))
 (declare (uses keys))
 (declare (uses items))
-(declare (uses db))
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))
 (declare (uses tree))

DELETED db.scm
Index: db.scm
==================================================================
--- db.scm
+++ /dev/null
@@ -1,70 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2016, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-;;======================================================================
-
-;;======================================================================
-;; Database access
-;;======================================================================
-
-;; dbstruct vector containing all the relevant dbs like main.db, megatest.db, run.db etc
-
-(declare (unit db))
-(declare (uses common))
-(declare (uses debugprint))
-(declare (uses dbmod))
-(declare (uses dbfile))
-(declare (uses keys))
-(declare (uses ods))
-(declare (uses mt))
-(declare (uses commonmod))
-(declare (uses configfmod))
-(declare (uses mtargs))
-(declare (uses rmtmod))
-
-(import commonmod
-	configfmod
-	(prefix mtargs args:))
-
-(use (srfi 18)
-     extras
-     ;; tcp
-     stack
-     (prefix sqlite3 sqlite3:)
-     srfi-1
-     posix
-     regex
-     regex-case
-     srfi-69
-     csv-xml
-     s11n
-     md5
-     message-digest
-     (prefix base64 base64:)
-     format
-     dot-locking
-     z3
-     typed-records
-     matchable
-     files)
-
-(import debugprint)
-(import dbfile)
-(import dbmod)
-(import rmtmod)
-

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -19,11 +19,10 @@
 ;;======================================================================
 
 (declare (unit dcommon))
 
 (declare (uses gutils))
-(declare (uses db))
 (declare (uses dbmod))
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses rmtmod))
 (declare (uses testsmod))

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -18,11 +18,10 @@
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (declare (unit ezsteps))
-(declare (uses db))
 (declare (uses commonmod))
 (declare (uses common))
 (declare (uses configfmod))
 (declare (uses debugprint))
 (declare (uses items))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -27,11 +27,10 @@
 (declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses processmod))
 (declare (uses configfmod))
 (declare (uses configf))
-(declare (uses db))
 (declare (uses rmtmod))
 (declare (uses ezsteps))
 ;; (declare (uses dbmod))
 (declare (uses dbfile))
 (declare (uses dbmod))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -80,18 +80,16 @@
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses env))
 (declare (uses diff-report))
-(declare (uses db))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses genexample))
 ;; (declare (uses daemon))
 
-(declare (uses db))
 ;; (declare (uses dcommon))
 
 ;; (declare (uses debugprint))
 ;; (declare (uses debugprint.import))
 

Index: monitor.scm
==================================================================
--- monitor.scm
+++ monitor.scm
@@ -19,11 +19,10 @@
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit runs))
-(declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses commonmod))
 (import commonmod)

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -22,11 +22,10 @@
 
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit mt))
 (declare (uses debugprint))
-(declare (uses db))
 (declare (uses common))
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses items))
 (declare (uses runconfig))

DELETED ods.scm
Index: ods.scm
==================================================================
--- ods.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-;; Copyright 2011, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-;;
-
-(use csv-xml regex)
-(declare (unit ods))
-(declare (uses common))
-(declare (uses commonmod))
-(import commonmod)
-

DELETED rmtdb.scm
Index: rmtdb.scm
==================================================================
--- rmtdb.scm
+++ /dev/null
@@ -1,20 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2013, Matthew Welland.
-;; 
-;; This file is part of Megatest.
-;; 
-;;     Megatest is free software: you can redistribute it and/or modify
-;;     it under the terms of the GNU General Public License as published by
-;;     the Free Software Foundation, either version 3 of the License, or
-;;     (at your option) any later version.
-;; 
-;;     Megatest is distributed in the hope that it will be useful,
-;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;     GNU General Public License for more details.
-;; 
-;;     You should have received a copy of the GNU General Public License
-;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -29,11 +29,10 @@
 (declare (uses megatestmod))
 (declare (uses mtmod))
 (declare (uses tasksmod))
 (declare (uses servermod))
 
-(declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses server))
 (declare (uses mt))

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -17,11 +17,10 @@
 ;;
 
 (declare (unit server))
 
 (declare (uses common))
-(declare (uses db))
 (declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses rmtmod))
 (declare (uses launch))

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -24,11 +24,10 @@
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses tasksmod))
 
 (declare (uses mt))
-(declare (uses db))
 (declare (uses common))
 
 (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
      posix-extras directory-utils pathname-expand typed-records format
      call-with-environment-variables)

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -24,13 +24,11 @@
 
 (declare (unit tdb))
 (declare (uses debugprint))
 (declare (uses common))
 (declare (uses keys))
-(declare (uses ods))
 (declare (uses mt))
-(declare (uses db))
 (declare (uses commonmod))
 (declare (uses mtargs))
 (declare (uses rmtmod))
 
 (require-extension (srfi 18) extras tcp)

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -21,11 +21,10 @@
 (declare (unit tree))
 (declare (uses mtargs))
 (declare (uses debugprint))
 (declare (uses launch))
 (declare (uses gutils))
-(declare (uses db))
 (declare (uses server))
 (declare (uses dcommon))
 
 (use format)
 (require-library iup)