diff --git a/datastore/sql/sqliteds.nim b/datastore/sql/sqliteds.nim
index 521e5d1..4b79391 100644
--- a/datastore/sql/sqliteds.nim
+++ b/datastore/sql/sqliteds.nim
@@ -37,10 +37,11 @@ method contains*(self: SQLiteDatastore, key: Key): Future[?!bool] {.async.} =
   proc onData(s: RawStmtPtr) =
     exists = sqlite3_column_int64(s, ContainsStmtExistsCol.cint).bool
 
-  let
-    queryRes = self.db.containsStmt.query((key.id), onData)
+  if (
+    let res = self.db.containsStmt.query((key.id), onData);
+    res.isErr):
+    return failure res.error.msg
 
-  if queryRes.isErr: return queryRes
   return success exists
 
 method delete*(self: SQLiteDatastore, key: Key): Future[?!void] {.async.} =
@@ -54,84 +55,80 @@ method get*(self: SQLiteDatastore, key: Key): Future[?!seq[byte]] {.async.} =
   var
     bytes: seq[byte]
 
-  let
-    dataCol = self.db.getDataCol
-
   proc onData(s: RawStmtPtr) =
-    bytes = dataCol()
+    bytes = self.db.getDataCol()
 
-  let
-    queryRes = self.db.getStmt.query((key.id), onData)
-
-  if queryRes.isErr:
-    return failure queryRes.error.msg
+  if (
+    let res = self.db.getStmt.query((key.id), onData);
+    res.isErr):
+    return failure res.error.msg
 
   return success bytes
 
 method put*(self: SQLiteDatastore, key: Key, data: seq[byte]): Future[?!void] {.async.} =
   return self.db.putStmt.exec((key.id, @data, timestamp()))
 
-iterator query*(
-  self: SQLiteDatastore,
-  query: Query): Future[QueryResponse] =
+# iterator query*(
+#   self: SQLiteDatastore,
+#   query: Query): Future[QueryResponse] =
 
-  let
-    queryStmt = QueryStmt.prepare(
-      self.db.env, QueryStmtStr).expect("should not fail")
+#   let
+#     queryStmt = QueryStmt.prepare(
+#       self.db.env, QueryStmtStr).expect("should not fail")
 
-    s = RawStmtPtr(queryStmt)
+#     s = RawStmtPtr(queryStmt)
 
-  defer:
-    discard sqlite3_reset(s)
-    discard sqlite3_clear_bindings(s)
-    s.dispose
+#   defer:
+#     discard sqlite3_reset(s)
+#     discard sqlite3_clear_bindings(s)
+#     s.dispose
 
-  let
-    v = sqlite3_bind_text(s, 1.cint, query.key.id.cstring, -1.cint,
-      SQLITE_TRANSIENT_GCSAFE)
+#   let
+#     v = sqlite3_bind_text(s, 1.cint, query.key.id.cstring, -1.cint,
+#       SQLITE_TRANSIENT_GCSAFE)
 
-  if not (v == SQLITE_OK):
-    raise (ref Defect)(msg: $sqlite3_errstr(v))
+#   if not (v == SQLITE_OK):
+#     raise (ref Defect)(msg: $sqlite3_errstr(v))
 
-  while true:
-    let
-      v = sqlite3_step(s)
+#   while true:
+#     let
+#       v = sqlite3_step(s)
 
-    case v
-    of SQLITE_ROW:
-      let
-        key = Key.init($sqlite3_column_text_not_null(
-          s, QueryStmtIdCol)).expect("should not fail")
+#     case v
+#     of SQLITE_ROW:
+#       let
+#         key = Key.init($sqlite3_column_text_not_null(
+#           s, QueryStmtIdCol)).expect("should not fail")
 
-        blob = sqlite3_column_blob(s, QueryStmtDataCol)
+#         blob = sqlite3_column_blob(s, QueryStmtDataCol)
 
-      # detect out-of-memory error
-      # see the conversion table and final paragraph of:
-      # https://www.sqlite.org/c3ref/column_blob.html
-      # see also https://www.sqlite.org/rescode.html
+#       # detect out-of-memory error
+#       # see the conversion table and final paragraph of:
+#       # https://www.sqlite.org/c3ref/column_blob.html
+#       # see also https://www.sqlite.org/rescode.html
 
-      # the "data" column can be NULL so in order to detect an out-of-memory
-      # error it is necessary to check that the result is a null pointer and
-      # that the result code is an error code
-      if blob.isNil:
-        let
-          v = sqlite3_errcode(sqlite3_db_handle(s))
+#       # the "data" column can be NULL so in order to detect an out-of-memory
+#       # error it is necessary to check that the result is a null pointer and
+#       # that the result code is an error code
+#       if blob.isNil:
+#         let
+#           v = sqlite3_errcode(sqlite3_db_handle(s))
 
-        if not (v in [SQLITE_OK, SQLITE_ROW, SQLITE_DONE]):
-          raise (ref Defect)(msg: $sqlite3_errstr(v))
+#         if not (v in [SQLITE_OK, SQLITE_ROW, SQLITE_DONE]):
+#           raise (ref Defect)(msg: $sqlite3_errstr(v))
 
-      let
-        dataLen = sqlite3_column_bytes(s, QueryStmtDataCol)
-        dataBytes = cast[ptr UncheckedArray[byte]](blob)
-        data = @(toOpenArray(dataBytes, 0, dataLen - 1))
-        fut = newFuture[QueryResponse]()
+#       let
+#         dataLen = sqlite3_column_bytes(s, QueryStmtDataCol)
+#         dataBytes = cast[ptr UncheckedArray[byte]](blob)
+#         data = @(toOpenArray(dataBytes, 0, dataLen - 1))
+#         fut = newFuture[QueryResponse]()
 
-      fut.complete((key, data))
-      yield fut
-    of SQLITE_DONE:
-      break
-    else:
-      raise (ref Defect)(msg: $sqlite3_errstr(v))
+#       fut.complete((key, data))
+#       yield fut
+#     of SQLITE_DONE:
+#       break
+#     else:
+#       raise (ref Defect)(msg: $sqlite3_errstr(v))
 
 proc new*(
   T: type SQLiteDatastore,