diff --git a/SignalMessaging/contacts/SystemContactsFetcher.swift b/SignalMessaging/contacts/SystemContactsFetcher.swift
index bf81a13a2..12178f179 100644
--- a/SignalMessaging/contacts/SystemContactsFetcher.swift
+++ b/SignalMessaging/contacts/SystemContactsFetcher.swift
@@ -214,7 +214,6 @@ public class SystemContactsFetcher: NSObject {
             self.contactStoreAdapter.requestAccess { (granted, error) in
                 if let error = error {
                     Logger.error("\(self.TAG) error fetching contacts: \(error)")
-                    Logger.flush()
                     completion(error)
                     return
                 }
diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
index 3e40c2db1..13557e32f 100644
--- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
+++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
@@ -207,10 +207,7 @@ public class FullTextSearchFinder: NSObject {
         guard message.hasAttachments() else {
             return nil
         }
-        guard let dbConnection = dbConnection else {
-            owsFail("Could not load attachment for search indexing.")
-            return nil
-        }
+        let dbConnection = OWSPrimaryStorage.shared().dbReadConnection
         var oversizeText: String?
         dbConnection.read({ (transaction) in
             guard let attachment = message.attachment(with: transaction) else {
@@ -223,8 +220,6 @@ public class FullTextSearchFinder: NSObject {
             guard attachmentStream.isOversizeText() else {
                 return
             }
-            Logger.verbose("attachmentStream: \(attachmentStream.contentType)")
-            Logger.flush()
             guard let text = attachmentStream.readOversizeText() else {
                 owsFail("Could not load oversize text attachment")
                 return
@@ -234,8 +229,6 @@ public class FullTextSearchFinder: NSObject {
         return oversizeText
     }
 
-    private static var dbConnection: YapDatabaseConnection?
-
     private class func indexContent(object: Any) -> String? {
         if let groupThread = object as? TSGroupThread {
             return self.groupThreadIndexer.index(groupThread)
@@ -277,10 +270,6 @@ public class FullTextSearchFinder: NSObject {
     private class var dbExtensionConfig: YapDatabaseFullTextSearch {
         SwiftAssertIsOnMainThread(#function)
 
-        if dbConnection == nil {
-            dbConnection = OWSPrimaryStorage.shared().newDatabaseConnection()
-        }
-
         let contentColumnName = "content"
 
         let handler = YapDatabaseFullTextSearchHandler.withObjectBlock { (dict: NSMutableDictionary, _: String, _: String, object: Any) in