diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index 6e354df88..da1d4badc 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -430,11 +430,6 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
         self.messageCellType = OWSMessageCellType_TextMessage;
         self.displayableBodyText = [[DisplayableText alloc] initWithFullText:@"" displayText:@"" isTextTruncated:NO];
     }
-
-    DDLogInfo(@"%@ --- %@ %@",
-        self.logTag,
-        self.interaction.uniqueId,
-        (self.hasBodyText ? self.displayableBodyText.displayText : @""));
 }
 
 - (OWSMessageCellType)messageCellType
diff --git a/Signal/src/ViewControllers/HomeViewController.m b/Signal/src/ViewControllers/HomeViewController.m
index a9577a1b5..c827a21d5 100644
--- a/Signal/src/ViewControllers/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeViewController.m
@@ -284,15 +284,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
     }
 
     [self updateBarButtonItems];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:0];
-        TSThread *thread = [self threadForIndexPath:indexPath];
-        if (!thread) {
-            return;
-        }
-        [self presentThread:thread keyboardOnViewAppearing:NO callOnViewAppearing:NO];
-    });
 }
 
 - (void)viewDidAppear:(BOOL)animated
diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m
index 9a86fc2ff..6c863fa3c 100644
--- a/SignalMessaging/utils/ThreadUtil.m
+++ b/SignalMessaging/utils/ThreadUtil.m
@@ -87,7 +87,8 @@ NS_ASSUME_NONNULL_BEGIN
                                 inThread:thread
                              messageBody:text
                            attachmentIds:[NSMutableArray new]
-                        expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0
+                        expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)
+                                  expireStartedAt:0
                           isVoiceMessage:NO
                         groupMetaMessage:TSGroupMessageNone
                            quotedMessage:nil];
@@ -129,7 +130,8 @@ NS_ASSUME_NONNULL_BEGIN
                                 inThread:thread
                              messageBody:attachment.captionText
                            attachmentIds:[NSMutableArray new]
-                        expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)expireStartedAt:0
+                        expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)
+                                  expireStartedAt:0
                           isVoiceMessage:[attachment isVoiceMessage]
                         groupMetaMessage:TSGroupMessageNone
                            quotedMessage:nil];
diff --git a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
index 68c322259..b9ce08ff5 100644
--- a/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
+++ b/SignalServiceKit/src/Messages/Interactions/TSErrorMessage.h
@@ -10,12 +10,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(int32_t, TSErrorMessageType) {
     TSErrorMessageNoSession,
-    TSErrorMessageWrongTrustedIdentityKey, // DEPRECATED: We no longer create TSErrorMessageWrongTrustedIdentityKey, but
+    // DEPRECATED: We no longer create TSErrorMessageWrongTrustedIdentityKey, but
     // persisted legacy messages could exist indefinitly.
+    TSErrorMessageWrongTrustedIdentityKey,
     TSErrorMessageInvalidKeyException,
-    TSErrorMessageMissingKeyId, // unused
+    // unused
+    TSErrorMessageMissingKeyId,
     TSErrorMessageInvalidMessage,
-    TSErrorMessageDuplicateMessage, // unused
+    // unused
+    TSErrorMessageDuplicateMessage,
     TSErrorMessageInvalidVersion,
     TSErrorMessageNonBlockingIdentityChange,
     TSErrorMessageUnknownContactBlockOffer,
diff --git a/SignalServiceKit/src/Messages/OWSMessageUtils.m b/SignalServiceKit/src/Messages/OWSMessageUtils.m
index 1607b1843..9ad041534 100644
--- a/SignalServiceKit/src/Messages/OWSMessageUtils.m
+++ b/SignalServiceKit/src/Messages/OWSMessageUtils.m
@@ -194,6 +194,7 @@ NS_ASSUME_NONNULL_BEGIN
         return nil;
     }
 
+    // TODO: Revisit this value.
     const int kMaxThumbnailSizePx = 100;
 
     // Try to resize image to thumbnail if necessary.