diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 461c288c5..c5ddb7be1 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -76,15 +76,6 @@ static const CGFloat ConversationInputToolbarBorderViewHeight = 0.5;
     return newSize;
 }
 
-- (void)setToolbarHeight:(CGFloat)toolbarHeight
-{
-    if (toolbarHeight == _toolbarHeight) {
-        return;
-    }
-
-    _toolbarHeight = toolbarHeight;
-}
-
 - (void)createContents
 {
     self.layoutMargins = UIEdgeInsetsZero;
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 11de97caf..da25a14f0 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3667,11 +3667,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     }
     CGRect keyboardEndFrame = [keyboardEndFrameValue CGRectValue];
 
-    //    DDLogVerbose(@"%@ keyboard change. Old Frame: %@, New Frame: %@",
-    //        self.logTag,
-    //        NSStringFromCGRect(keyboardBeginFrame),
-    //        NSStringFromCGRect(keyboardEndFrame));
-
     UIEdgeInsets oldInsets = self.collectionView.contentInset;
     UIEdgeInsets newInsets = oldInsets;
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m
index 224048f80..f0dbdfb27 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewLayout.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "ConversationViewLayout.h"
@@ -69,10 +69,6 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     
-    if (self.collectionView.bounds.size.width <= 0.f || self.collectionView.bounds.size.height <= 0.f) {
-        [self.collectionView layoutIfNeeded];
-    }
-    
     if (self.collectionView.bounds.size.width <= 0.f || self.collectionView.bounds.size.height <= 0.f) {
         OWSFail(
             @"%@ Collection view has invalid size: %@", self.logTag, NSStringFromCGRect(self.collectionView.bounds));
diff --git a/SignalServiceKit/src/Storage/OWSOrphanedDataCleaner.m b/SignalServiceKit/src/Storage/OWSOrphanedDataCleaner.m
index 264daab7d..4fa9b90d9 100644
--- a/SignalServiceKit/src/Storage/OWSOrphanedDataCleaner.m
+++ b/SignalServiceKit/src/Storage/OWSOrphanedDataCleaner.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSOrphanedDataCleaner.h"
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)auditAndCleanupAsync:(void (^_Nullable)())completion
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//        [OWSOrphanedDataCleaner auditAndCleanup:YES completion:completion];
+        [OWSOrphanedDataCleaner auditAndCleanup:YES completion:completion];
     });
 }