diff --git a/datastore/memoryds.nim b/datastore/memoryds.nim
index 1910c43..dd3192f 100644
--- a/datastore/memoryds.nim
+++ b/datastore/memoryds.nim
@@ -70,7 +70,6 @@ method put*(
 
   let dk = KeyBuffer.new(key)
   let dv = ValueBuffer.new(data)
-  echo "MemoryDatastore:put: ", key, " => ", data.repr
   self.store[dk] = dv
   return success()
 
diff --git a/datastore/threadbackend.nim b/datastore/threadbackend.nim
index f495cf7..476ebfe 100644
--- a/datastore/threadbackend.nim
+++ b/datastore/threadbackend.nim
@@ -136,11 +136,8 @@ proc put*(
   key: Key,
   data: seq[byte]
 ) =
-  echo "thrfrontend:put: "
   let bkey = StringBuffer.new(key.id())
   let bval = DataBuffer.new(data)
-  print "bkey: ", bkey
-  print "bval: ", bval
 
   tds[].tp.spawn putTask(ret, tds, bkey, bval)
 
diff --git a/datastore/threadproxyds.nim b/datastore/threadproxyds.nim
index 7339642..a67c9ab 100644
--- a/datastore/threadproxyds.nim
+++ b/datastore/threadproxyds.nim
@@ -37,10 +37,10 @@ method has*(
     has(ret, self.tds, key)
     await wait(ret[].signal)
   finally:
-    echo "closing signal"
+    # echo "closing signal"
     ret[].signal.close()
 
-  echo "\nSharedDataStore:has:value: ", ret[].repr
+  # echo "\nSharedDataStore:has:value: ", ret[].repr
   return success(ret[].value)
 
 method delete*(
@@ -55,10 +55,10 @@ method delete*(
     delete(ret, self.tds, key)
     await wait(ret[].signal)
   finally:
-    echo "closing signal"
+    # echo "closing signal"
     ret[].signal.close()
 
-  echo "\nSharedDataStore:put:value: ", ret[].repr
+  # echo "\nSharedDataStore:put:value: ", ret[].repr
   return success()
 
 method delete*(
@@ -84,10 +84,9 @@ method get*(
     get(ret, self.tds, key)
     await wait(ret[].signal)
   finally:
-    echo "closing signal"
     ret[].signal.close()
 
-  print "\nSharedDataStore:put:value: ", ret[]
+  # print "\nSharedDataStore:put:value: ", ret[]
   let data = ret[].value.toSeq(byte)
   return success(data)
 
@@ -100,15 +99,13 @@ method put*(
   without ret =? newThreadResult(void), err:
     return failure(err)
 
-  echo "res: ", ret
   try:
     put(ret, self.tds, key, data)
     await wait(ret[].signal)
   finally:
-    echo "closing signal"
     ret[].signal.close()
 
-  echo "\nSharedDataStore:put:value: ", ret[].repr
+  # echo "\nSharedDataStore:put:value: ", ret[].repr
   return success()
 
 method put*(
@@ -126,7 +123,6 @@ method close*(
   self: ThreadProxyDatastore
 ): Future[?!void] {.async.} =
   # TODO: how to handle failed close?
-  echo "ThreadDatastore: FREE: "
   result = success()
 
   without res =? self.tds[].ds.close(), err:
diff --git a/tests/datastore/testsharedbuffer.nim b/tests/datastore/testdatabuffer.nim
similarity index 100%
rename from tests/datastore/testsharedbuffer.nim
rename to tests/datastore/testdatabuffer.nim