diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index fb02eba52..28ec0106d 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -2193,7 +2193,7 @@ typedef enum : NSUInteger {
             OWSFail(@"Unexpected tap for system message.");
             break;
         case OWSContactOffersAdapter:
-            // TODO:
+            OWSFail(@"Unexpected tap for contacts offer.");
             break;
         default:
             DDLogDebug(@"Unhandled bubble touch for interaction: %@.", interaction);
diff --git a/Signal/src/util/ThreadUtil.m b/Signal/src/util/ThreadUtil.m
index da66fc205..700c25973 100644
--- a/Signal/src/util/ThreadUtil.m
+++ b/Signal/src/util/ThreadUtil.m
@@ -236,23 +236,6 @@ NS_ASSUME_NONNULL_BEGIN
                           }
                       }];
 
-        __block TSInteraction *lastCallOrMessage = nil;
-        [[transaction ext:TSMessageDatabaseViewExtensionName]
-            enumerateRowsInGroup:thread.uniqueId
-                     withOptions:NSEnumerationReverse
-                      usingBlock:^(
-                          NSString *collection, NSString *key, id object, id metadata, NSUInteger index, BOOL *stop) {
-
-                          OWSAssert([object isKindOfClass:[TSInteraction class]]);
-
-                          if ([object isKindOfClass:[TSIncomingMessage class]] ||
-                              [object isKindOfClass:[TSOutgoingMessage class]] ||
-                              [object isKindOfClass:[TSCall class]]) {
-                              lastCallOrMessage = object;
-                              *stop = YES;
-                          }
-                      }];
-
         NSUInteger outgoingMessageCount =
             [[TSDatabaseView threadOutgoingMessageDatabaseView:transaction] numberOfItemsInGroup:thread.uniqueId];
         NSUInteger threadMessageCount =
@@ -439,7 +422,6 @@ NS_ASSUME_NONNULL_BEGIN
             = (shouldHaveBlockOffer || shouldHaveAddToContactsOffer || shouldHaveAddToProfileWhitelistOffer);
         if (isContactThread) {
             TSContactThread *contactThread = (TSContactThread *)thread;
-            // TODO: Set this property.
             if (contactThread.hasDismissedOffers) {
                 shouldHaveContactOffers = NO;
             }