diff --git a/README.md b/README.md
index f6965493..653a6d60 100644
--- a/README.md
+++ b/README.md
@@ -318,7 +318,7 @@ removed automatically when the weekly captured observer has been deallocated.
 
 ```swift
 // Add observer
-let token = storage.addStorageObserver(self) { observer, storage, change
+let token = storage.addStorageObserver(self) { observer, storage, change in
   switch change {
   case .add(let key):
     print("Added \(key)")
@@ -356,7 +356,7 @@ let token = storage.addObserver(self, forKey: key) { observer, storage, change i
 token.cancel()
 
 // Remove observer for key
-storage.removeObserver(forKey: "user1")
+storage.removeObserver(forKey: key)
 
 // Remove all observers
 storage.removeAllKeyObservers()
diff --git a/Source/Shared/Storage/HybridStorage.swift b/Source/Shared/Storage/HybridStorage.swift
index 3cb4f2ac..5e96fbce 100644
--- a/Source/Shared/Storage/HybridStorage.swift
+++ b/Source/Shared/Storage/HybridStorage.swift
@@ -5,8 +5,8 @@ public final class HybridStorage<T> {
   public let memoryStorage: MemoryStorage<T>
   public let diskStorage: DiskStorage<T>
 
-  private(set) var storageObservations = [UUID : (HybridStorage, StorageChange) -> Void]()
-  private(set) var keyObservations = [String : (HybridStorage, KeyChange<T>) -> Void]()
+  private(set) var storageObservations = [UUID: (HybridStorage, StorageChange) -> Void]()
+  private(set) var keyObservations = [String: (HybridStorage, KeyChange<T>) -> Void]()
 
   public init(memoryStorage: MemoryStorage<T>, diskStorage: DiskStorage<T>) {
     self.memoryStorage = memoryStorage
diff --git a/Source/Shared/Storage/Storage.swift b/Source/Shared/Storage/Storage.swift
index b67ffcf8..63e0a698 100644
--- a/Source/Shared/Storage/Storage.swift
+++ b/Source/Shared/Storage/Storage.swift
@@ -36,24 +36,10 @@ public final class Storage<T> {
       storage: hybridStorage,
       serialQueue: DispatchQueue(label: "Cache.AsyncStorage.SerialQueue")
     )
-    subscribeToChanges(in: hybridStorage)
   }
 
   /// Used for async operations
   public lazy var async = self.asyncStorage
-
-  private func subscribeToChanges(in storage: HybridStorage<T>) {
-//    storage.storageObservationRegistry.addObservation { [weak self] _, change in
-//      guard let strongSelf = self else { return }
-//      strongSelf.storageObservationRegistry.notifyObservers(about: change, in: strongSelf)
-//    }
-//    keyObservationRegistry.onNewKey = { [weak self] key in
-//      guard let strongSelf = self else { return }
-//      storage.keyObservationRegistry.addObservation({ _, change in
-//        strongSelf.keyObservationRegistry.notifyObserver(forKey: key, about: change, in: strongSelf)
-//      }, forKey: key)
-//    }
-  }
 }
 
 extension Storage: StorageAware {