diff --git a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
index 01703c3b2c..863828814e 100644
--- a/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/OWSLinkedDevicesTableViewController.m
@@ -249,15 +249,6 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
 
 #pragma mark - Table view data source
 
-- (void)deviceDidChange:(NSNotification *)notification
-{
-    OWSAssertIsOnMainThread();
-
-    OWSLogVerbose(@"");
-
-    [self updateDeviceList];
-}
-
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     return 2;
diff --git a/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage.swift b/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage.swift
index adaebbd329..9d69d2f6ed 100644
--- a/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage.swift
+++ b/SignalServiceKit/src/Storage/Database/SDSDatabaseStorage.swift
@@ -653,9 +653,6 @@ public class GRDBDatabaseStorageAdapter: NSObject {
         self.mediaGalleryDatabaseObserver = mediaGalleryDatabaseObserver
         uiDatabaseObserver.appendSnapshotDelegate(mediaGalleryDatabaseObserver)
 
-        // MediaGalleryDatabaseObserver is built on top of UIDatabaseObserver
-        // but includes the details necessary for rendering collection view
-        // batch updates.
         let genericDatabaseObserver = GRDBGenericDatabaseObserver()
         self.genericDatabaseObserver = genericDatabaseObserver
         uiDatabaseObserver.appendSnapshotDelegate(genericDatabaseObserver)
diff --git a/SignalServiceKit/src/Storage/Database/SDSDatabaseStorageObservation.swift b/SignalServiceKit/src/Storage/Database/SDSDatabaseStorageObservation.swift
index 4bae1f6245..adb4d357e0 100644
--- a/SignalServiceKit/src/Storage/Database/SDSDatabaseStorageObservation.swift
+++ b/SignalServiceKit/src/Storage/Database/SDSDatabaseStorageObservation.swift
@@ -136,7 +136,9 @@ class SDSDatabaseStorageObservation {
 
     init() {
         // GRDB TODO: We only need to do this if YDB is active.
-        addYDBObservers()
+        AppReadiness.runNowOrWhenAppDidBecomeReady {
+            self.addYDBObservers()
+        }
     }
 
     private func addYDBObservers() {
diff --git a/SignalServiceKit/src/Storage/Database/Snapshots/GRDBGenericDatabaseObserver.swift b/SignalServiceKit/src/Storage/Database/Snapshots/GRDBGenericDatabaseObserver.swift
index fd29289e68..4e5bd4393b 100644
--- a/SignalServiceKit/src/Storage/Database/Snapshots/GRDBGenericDatabaseObserver.swift
+++ b/SignalServiceKit/src/Storage/Database/Snapshots/GRDBGenericDatabaseObserver.swift
@@ -88,11 +88,11 @@ public class GRDBGenericDatabaseObserver: NSObject {
     }()
 
     private func committedChanges(forPendingChanges pendingChanges: PendingChanges, db: Database) throws -> CommittedChanges {
-        return CommittedChanges(collections: try collections(forPendingChanges: pendingChanges, db: db),
+        return CommittedChanges(collections: collections(forPendingChanges: pendingChanges, db: db),
                                 interactionIds: try interactionIds(forPendingChanges: pendingChanges, db: db))
     }
 
-    private func collections(forPendingChanges pendingChanges: PendingChanges, db: Database) throws -> Set<String> {
+    private func collections(forPendingChanges pendingChanges: PendingChanges, db: Database) -> Set<String> {
         guard pendingChanges.tableNames.count > 0 else {
             return pendingChanges.collections
         }