diff --git a/README.md b/README.md
index 604f2a7..4eef7f3 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ Eg: `pigeon identity show` becomes `./pigeon-cli show`.
  - [X] Add Lipmaa links like the Bamboo folks do.
  - [X] Set a max message size.
  - [ ] Update README.md. Needs user manual for new `Pigeon::Database` class.
+ - [ ] Remove all `.current` "singletons" / hacks
  - [ ] Make the switch to LevelDB, RocksDB, [UNQLite](https://unqlite.org/features.html) or similar (currently using Ruby PStore).
  - [ ] Make CLI names consistent with API names. Eg: find vs. read.
  - [ ] Create regexes in ::Lexer using strings and Regexp.new() for cleaner regexes.
@@ -66,7 +67,6 @@ Eg: `pigeon identity show` becomes `./pigeon-cli show`.
  - [ ] Check block list before ingesting bundles.
  - [ ] Handle the three outcomes of bundle ingestion: `ok`, `blocked`, `already_saved`.
  - [ ] add parsers and validators for all CLI inputs
- - [ ] Remove all `.current` "singletons" / hacks
  - [ ] Reduce whole darn repo into single module to aide portability. `::Helpers` module is OK.
  - [ ] Use URNs instead of multihash?
  - [ ] Ensure all disks writes perform verification!
diff --git a/dist/pigeon/lexer.rb b/dist/pigeon/lexer.rb
index e4534c4..415d2bc 100644
--- a/dist/pigeon/lexer.rb
+++ b/dist/pigeon/lexer.rb
@@ -68,7 +68,6 @@ module Pigeon
     PREV = /prev (#{MESG_VALUE}|#{NULL_VALUE})\n/
     KIND = /kind #{ALPHANUMERICISH}\n/
     BODY_ENTRY = /#{ALPHANUMERICISH}:#{ANY_VALUE}\n/
-
     FOOTER_ENTRY = /signature .*{103}\.sig\.ed25519\n?/
 
     LEXER_STATES = [HEADER = :header, BODY = :body, FOOTER = :footer]
diff --git a/dist/pigeon/storage.rb b/dist/pigeon/storage.rb
index ef9c1a9..a7840e7 100644
--- a/dist/pigeon/storage.rb
+++ b/dist/pigeon/storage.rb
@@ -65,13 +65,11 @@ module Pigeon
     end
 
     def find_all(author)
-      # TODO: Ability to pass an author ID to `find-all`
-      store = Pigeon::Storage.current
       all = []
       depth = -1
       last = ""
-      until (last == nil) || (depth > 999999)
-        last = store.get_message_by_depth(author, depth += 1)
+      until (last == nil) || (depth > 99999)
+        last = self.get_message_by_depth(author, depth += 1)
         all.push(last) if last
       end
       return all
diff --git a/spec/pigeon/message_spec.rb b/spec/pigeon/message_spec.rb
index 6d968a9..4c700ff 100644
--- a/spec/pigeon/message_spec.rb
+++ b/spec/pigeon/message_spec.rb
@@ -93,8 +93,6 @@ RSpec.describe Pigeon::Message do
     expect(m4.prev).to be
   end
 
-  it "verifies accuracy of Lipmaa links"
-
   it "does not allow message with more than 64 keys" do
     error = "Messages cannot have more than 64 keys. Got 65."
     body = {}