From 27ddf4a352d313b87831276bdc6107a8db855c2c Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Mon, 4 Dec 2017 13:57:11 -0500
Subject: [PATCH] Cleanup before PR

---
 Signal/src/ViewControllers/ContactsViewHelper.m | 1 -
 Signal/src/ViewControllers/ThreadViewHelper.h   | 1 +
 Signal/src/ViewControllers/ThreadViewHelper.m   | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/ContactsViewHelper.m b/Signal/src/ViewControllers/ContactsViewHelper.m
index 50dafced6..7fc14b62a 100644
--- a/Signal/src/ViewControllers/ContactsViewHelper.m
+++ b/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"
diff --git a/Signal/src/ViewControllers/ThreadViewHelper.h b/Signal/src/ViewControllers/ThreadViewHelper.h
index 6b73af8c4..d6d98b638 100644
--- a/Signal/src/ViewControllers/ThreadViewHelper.h
+++ b/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
diff --git a/Signal/src/ViewControllers/ThreadViewHelper.m b/Signal/src/ViewControllers/ThreadViewHelper.m
index 3df98fdfe..5af480c06 100644
--- a/Signal/src/ViewControllers/ThreadViewHelper.m
+++ b/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;
 }