diff --git a/src/dodb.cl b/src/dodb.cl
index 75df443..812d15c 100644
--- a/src/dodb.cl
+++ b/src/dodb.cl
@@ -240,7 +240,6 @@
     (remhash object-index (db-data database))))
 
 ; Search for the data from the FS.
-; TODO: get the hash index, too.
 (defun db/search/fs/get-by-index (database index-name value)
   (filename->integer
     (osicat:read-link
@@ -254,22 +253,10 @@
   (loop for filename in (ls (db/partition/get-directory-path database name value))
         collect (filename->integer filename)))
 
-;; Search for the data from the in-memory data.
-;; TODO: get the hash index, too.
-;
-;(defun db/search/mem/get-by-index (database index-name value)
-;  (util:read-object-from-file (concatenate 'string
-;    (db/index/get-directory-path database index-name) "/" value)))
-;
-;(defun db/search/mem/get-by-partition (database name value)
-;  (loop for car in (ls (db/partition/get-directory-path database name value))
-;        collect (util:read-object-from-file car)))
-
 ; By default, search on the FS.
 (alias db/get-by-index     db/search/fs/get-by-index)
 (alias db/get-by-partition db/search/fs/get-by-partition)
 
-; TODO: remove old indexes and partitions
 ; TODO: check database integrity (redundancy)
 ; TODO: locking
 (defun db/update (database object-index)