Clean up ahead of PR.

Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m

@@ -125,7 +125,7 @@ NS_ASSUME_NONNULL_BEGIN
                                : [self audioColorWithOpacity:0.4f]);
 }
 
-#pragma mark - JSQMessageMediaData protocol
+#pragma mark -
 
 - (CGFloat)audioIconHMargin
 {

Signal/src/ViewControllers/ConversationView/Cells/OWSContactShareView.m

@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-#pragma mark - JSQMessageMediaData protocol
+#pragma mark -
 
 - (CGFloat)iconHMargin
 {

Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m

@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
     return self;
 }
 
-#pragma mark - JSQMessageMediaData protocol
+#pragma mark -
 
 - (CGFloat)iconHMargin
 {

Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m

@@ -332,7 +332,6 @@ NS_ASSUME_NONNULL_BEGIN
             bodyMediaViewHasGreedyWidth = YES;
             break;
         case OWSMessageCellType_ShareContact:
-            // TODO:
             bodyMediaView = [self loadViewForShareContact];
             bodyMediaViewHasGreedyWidth = YES;
             break;
@@ -801,7 +800,7 @@ NS_ASSUME_NONNULL_BEGIN
         [[OWSContactShareView alloc] initWithContactShare:self.viewItem.contactShare
                                                isIncoming:self.isIncoming];
     [contactShareView createContents];
-    //    [self addAttachmentUploadViewIfNecessary:attachmentView];
+    // TODO: Should we change appearance if contact avatar is uploading?
 
     self.loadCellContentBlock = ^{
         // Do nothing.

Signal/src/ViewControllers/DebugUI/DebugUIMessages.m

@@ -2942,7 +2942,6 @@ typedef OWSContact * (^OWSContactBlock)(void);
                                               contactBlock:^{
                                                   OWSContact *contact = [OWSContact new];
                                                   contact.givenName = @"Alice";
-                                                  contact.displayName = @"Alice";
                                                   OWSContactPhoneNumber *phoneNumber = [OWSContactPhoneNumber new];
                                                   phoneNumber.phoneType = OWSContactPhoneType_Home;
                                                   phoneNumber.phoneNumber = @"+13213214321";
@@ -2956,7 +2955,6 @@ typedef OWSContact * (^OWSContactBlock)(void);
                                               contactBlock:^{
                                                   OWSContact *contact = [OWSContact new];
                                                   contact.givenName = @"Bob";
-                                                  contact.displayName = @"Bob";
                                                   OWSContactEmail *email = [OWSContactEmail new];
                                                   email.emailType = OWSContactEmailType_Home;
                                                   email.email = @"a@b.com";
@@ -2975,7 +2973,6 @@ typedef OWSContact * (^OWSContactBlock)(void);
                                                   contact.namePrefix = @"Ms.";
                                                   contact.nameSuffix = @"Esq.";
                                                   contact.organizationName = @"Falafel Hut";
-                                                  contact.displayName = @"Ms. Alice Bob Carol Esq.";
 
                                                   OWSContactPhoneNumber *phoneNumber1 = [OWSContactPhoneNumber new];
                                                   phoneNumber1.phoneType = OWSContactPhoneType_Home;