Clean up ahead of PR.

Signal/src/AppDelegate.m

@@ -854,16 +854,6 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
 
     [[OWSProfileManager sharedManager] ensureLocalProfileCached];
 
-//#ifdef DEBUG
-//    // A bug in orphan cleanup could be disastrous so let's only
-//    // run it in DEBUG builds for a few releases.
-//    //
-//    // TODO: Release to production once we have analytics.
-//    // TODO: Orphan cleanup is somewhat expensive - not least in doing a bunch
-//    //       of disk access.  We might want to only run it "once per version"
-//    //       or something like that in production.
-//    [OWSOrphanedDataCleaner auditAndCleanupAsync:nil];
-//#endif
 
     [OWSProfileManager.sharedManager fetchLocalUsersProfile];
     [[OWSReadReceiptManager sharedManager] prepareCachedValues];

SignalServiceKit/src/Storage/OWSStorage.h

@@ -53,8 +53,12 @@ extern NSString *const StorageIsReadyNotification;
 // TODO: Deprecate?
 - (nullable YapDatabaseConnection *)newDatabaseConnection;
 
+#ifdef DEBUG
 - (BOOL)registerExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName;
+#endif
+
 - (void)asyncRegisterExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName;
+
 - (nullable id)registeredExtension:(NSString *)extensionName;
 
 - (unsigned long long)databaseFileSize;

SignalServiceKit/src/Storage/TSDatabaseView.m

@@ -29,6 +29,14 @@ NSString *const TSUnseenDatabaseViewExtensionName = @"TSUnseenDatabaseViewExtens
 NSString *const TSThreadSpecialMessagesDatabaseViewExtensionName = @"TSThreadSpecialMessagesDatabaseViewExtensionName";
 NSString *const TSSecondaryDevicesDatabaseViewExtensionName = @"TSSecondaryDevicesDatabaseViewExtensionName";
 
+@interface OWSStorage (TSDatabaseView)
+
+- (BOOL)registerExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName;
+
+@end
+
+#pragma mark -
+
 @implementation TSDatabaseView
 
 + (void)registerCrossProcessNotifier:(OWSStorage *)storage