diff --git a/Signal/src/ViewControllers/HomeViewController.m b/Signal/src/ViewControllers/HomeViewController.m
index 9c3f41dc1..dd48ef95e 100644
--- a/Signal/src/ViewControllers/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeViewController.m
@@ -284,11 +284,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
     }
 
     [self updateBarButtonItems];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        TSThread *thread = [self threadForIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-        [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
-    });
 }
 
 - (void)viewDidAppear:(BOOL)animated
diff --git a/SignalMessaging/categories/UIView+OWS.h b/SignalMessaging/categories/UIView+OWS.h
index 5479c8584..095624c38 100644
--- a/SignalMessaging/categories/UIView+OWS.h
+++ b/SignalMessaging/categories/UIView+OWS.h
@@ -125,22 +125,4 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value);
 
 @end
 
-//#pragma mark -
-//
-//@interface NSLayoutConstraint (OWS)
-//
-//- (NSLayoutConstraint *)withLowPriority;
-//- (NSLayoutConstraint *)withHighPriority;
-//
-//@end
-//
-//#pragma mark -
-//
-//@interface NSArray (OWSLayout)
-//
-//- (NSArray *)withLowPriorities;
-//- (NSArray *)withHighPriorities;
-//
-//@end
-
 NS_ASSUME_NONNULL_END
diff --git a/SignalMessaging/categories/UIView+OWS.m b/SignalMessaging/categories/UIView+OWS.m
index c83533372..2297497ff 100644
--- a/SignalMessaging/categories/UIView+OWS.m
+++ b/SignalMessaging/categories/UIView+OWS.m
@@ -487,44 +487,4 @@ CGFloat ScaleFromIPhone5(CGFloat iPhone5Value)
 
 @end
 
-//#pragma mark -
-//
-//@implementation NSLayoutConstraint (OWS)
-//
-//- (NSLayoutConstraint *)withLowPriority
-//{
-//    self.priority = UILayoutPriorityDefaultLow;
-//    return self;
-//}
-//
-//- (NSLayoutConstraint *)withHighPriority
-//{
-//    self.priority = UILayoutPriorityDefaultHigh;
-//    return self;
-//}
-//
-//@end
-//
-//#pragma mark -
-//
-//@implementation NSArray (OWSLayout)
-//
-//- (instancetype)withLowPriorities
-//{
-//    for (NSLayoutConstraint *constraint in self) {
-//        constraint.priority = UILayoutPriorityDefaultLow;
-//    }
-//    return self;
-//}
-//
-//- (instancetype)withHighPriorities
-//{
-//    for (NSLayoutConstraint *constraint in self) {
-//        constraint.priority = UILayoutPriorityDefaultHigh;
-//    }
-//    return self;
-//}
-//
-//@end
-
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
index 33bcd2141..15ca2fbd9 100644
--- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
+++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m
@@ -572,8 +572,6 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssertIsOnMainThread();
     OWSAssert([self isAudio]);
 
-    //    return 0;
-
     NSError *error;
     AVAudioPlayer *audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:self.mediaURL error:&error];
     if (error && [error.domain isEqualToString:NSOSStatusErrorDomain]