diff --git a/src/Messages/Interactions/OWSVerificationStateChangeMessage.m b/src/Messages/Interactions/OWSVerificationStateChangeMessage.m
index ff46c791dc..8b82f51b29 100644
--- a/src/Messages/Interactions/OWSVerificationStateChangeMessage.m
+++ b/src/Messages/Interactions/OWSVerificationStateChangeMessage.m
@@ -15,10 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
                 verificationState:(OWSVerificationState)verificationState
                     isLocalChange:(BOOL)isLocalChange
 {
-    OWSAssert(recipientId.length > 0)
+    OWSAssert(recipientId.length > 0);
 
-        self
-        = [super initWithTimestamp:timestamp inThread:thread messageType:TSInfoMessageVerificationStateChange];
+    self = [super initWithTimestamp:timestamp inThread:thread messageType:TSInfoMessageVerificationStateChange];
     if (!self) {
         return self;
     }
diff --git a/src/Messages/OWSIdentityManager.m b/src/Messages/OWSIdentityManager.m
index 6dd8943fef..2856e1039d 100644
--- a/src/Messages/OWSIdentityManager.m
+++ b/src/Messages/OWSIdentityManager.m
@@ -192,8 +192,6 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
             // Cancel any pending verification state sync messages for this recipient.
             [self clearSyncMessageForRecipientId:recipientId];
 
-            // TODO: This may be redundant with the "safety number changes"
-            //       messages.
             if (existingIdentity.verificationState != verificationState) {
                 [self saveChangeMessagesForRecipientId:recipientId
                                      verificationState:verificationState