diff --git a/src/Context.cpp b/src/Context.cpp
index a1dba2cc8..3a0e4a827 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -141,8 +141,9 @@ int Context::initialize (int argc, const char** argv)
       locale = locale.substr (0, period);
 
     // Initialize the database.
-    tdb.clear ();
-    tdb.location (data_dir);
+    tdb.clear ();                   // TODO Obsolete
+    tdb.location (data_dir);        // TODO Obsolete
+    tdb2.set_location (data_dir);
 
     // Hook system init, plus post-start event occurring at the first possible
     // moment after hook initialization.
@@ -256,7 +257,10 @@ int Context::dispatch (std::string &out)
 
     // GC is invoked prior to running any command that displays task IDs.
     if (c->displays_id ())
+    {
       tdb.gc ();
+      tdb2.gc ();
+    }
 
     args.dump ("Argument Categorization");
     return c->execute (out);
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 80e751c99..1824b8e66 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -266,6 +266,13 @@ void TDB2::commit ()
   synch_key.commit ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int TDB2::gc ()
+{
+
+  return 0;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 #if 0
diff --git a/src/TDB2.h b/src/TDB2.h
index 26df5bda6..1e0126b7e 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -85,6 +85,7 @@ public:
   void add (const Task&);
   void modify (const Task&);
   void commit ();
+  int gc ();
 
 public:
   TF2 pending;