diff --git a/src/Storages/Kafka/KafkaConsumer2.cpp b/src/Storages/Kafka/KafkaConsumer2.cpp
index 9ed698301e5..1320b939612 100644
--- a/src/Storages/Kafka/KafkaConsumer2.cpp
+++ b/src/Storages/Kafka/KafkaConsumer2.cpp
@@ -304,7 +304,6 @@ ReadBufferPtr KafkaConsumer2::consume(const TopicPartition & topic_partition, co
             return next_message;
     }
 
-    // TODO(antaljanosbenjamin): check if we should poll new messages or not
     while (true)
     {
         stalled_status = StalledStatus::NO_MESSAGES_RETURNED;
diff --git a/src/Storages/Kafka/StorageKafka2.cpp b/src/Storages/Kafka/StorageKafka2.cpp
index fa5389d606a..911de671fb7 100644
--- a/src/Storages/Kafka/StorageKafka2.cpp
+++ b/src/Storages/Kafka/StorageKafka2.cpp
@@ -815,7 +815,7 @@ StorageKafka2::lockTopicPartitions(zkutil::ZooKeeper & keeper_to_use, const Topi
         if (code != Coordination::Error::ZNODEEXISTS)
             zkutil::KeeperMultiException::check(code, ops, responses);
 
-        // TODO(antaljanosbenjamin): maybe check the content, if we have the locks, we can continue with them
+        // Possible optimization: check the content of logfiles, if we locked them, then we can clean them up and retry to lock them.
         return std::nullopt;
     }
 
@@ -1022,7 +1022,6 @@ StorageKafka2::PolledBatchInfo StorageKafka2::pollConsumer(
             total_rows = total_rows + new_rows;
             batch_info.last_offset = consumer.currentOffset();
         }
-        // TODO(antaljanosbenjamin): think about this when rebalance is happening, because `isStalled()` will return true
         else if (consumer.isStalled())
         {
             ++failed_poll_attempts;
@@ -1168,7 +1167,6 @@ bool StorageKafka2::streamToViews(size_t idx)
             if (current_assignment == nullptr)
             {
                 // The consumer lost its assignment and haven't received a new one.
-                // TODO(antaljanosbenjamin): returning a proper value representing the state
                 // By returning true this function reports the current consumer as a "stalled" stream, which
                 return true;
             }