diff --git a/implementations/ondisk/OnDiskBlock.cpp b/implementations/ondisk/OnDiskBlock.cpp
index 2ece694f..64947717 100644
--- a/implementations/ondisk/OnDiskBlock.cpp
+++ b/implementations/ondisk/OnDiskBlock.cpp
@@ -62,7 +62,6 @@ unique_ptr<OnDiskBlock> OnDiskBlock::LoadFromDisk(const bf::path &rootdir, const
 }
 
 unique_ptr<OnDiskBlock> OnDiskBlock::CreateOnDisk(const bf::path &rootdir, const Key &key, size_t size) {
-  //TODO Only writeback, if data was actually changed (Block::write() was called)
   auto filepath = rootdir / key.ToString();
   if (bf::exists(filepath)) {
     return nullptr;
diff --git a/interface/BlockStore.h b/interface/BlockStore.h
index 8c797fc6..3ba6007a 100644
--- a/interface/BlockStore.h
+++ b/interface/BlockStore.h
@@ -9,8 +9,6 @@
 
 namespace blockstore {
 
-//TODO Don't use string, but own class for keys? (better performance for all keys have same length)
-
 class BlockStore {
 public:
   virtual ~BlockStore() {}