Cleanup before PR

Signal/src/ViewControllers/ContactsViewHelper.m

@@ -3,7 +3,6 @@
 //
 
 #import "ContactsViewHelper.h"
-//#import "ContactTableViewCell.h"
 #import "Environment.h"
 #import "NSString+OWS.h"
 #import "OWSProfileManager.h"

Signal/src/ViewControllers/ThreadViewHelper.h

@@ -22,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface ThreadViewHelper : NSObject
 
 @property (nonatomic, weak) id<ThreadViewHelperDelegate> delegate;
+
 @property (nonatomic, readonly) NSMutableArray<TSThread *> *threads;
 
 @end

Signal/src/ViewControllers/ThreadViewHelper.m

@@ -3,7 +3,6 @@
 //
 
 #import "ThreadViewHelper.h"
-#import "Signal-Swift.h"
 #import <SignalServiceKit/TSDatabaseView.h>
 #import <SignalServiceKit/TSStorageManager.h>
 #import <SignalServiceKit/TSThread.h>
@@ -17,7 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic) YapDatabaseConnection *uiDatabaseConnection;
 @property (nonatomic) YapDatabaseViewMappings *threadMappings;
-@property (nonatomic) ConversationSearcher *conversationSearcher;
 
 @end
 
@@ -31,7 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     [self initializeMapping];
-    _conversationSearcher = ConversationSearcher.shared;
 
     return self;
 }