diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index 1f58a24c04..75f403d6fa 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -816,20 +816,14 @@ std::vector<rtcp::ReportBlock> RTCPSender::CreateReportBlocks(
   if (!receive_statistics_)
     return result;
 
-  // TODO(danilchap): Support sending more than `RTCP_MAX_REPORT_BLOCKS` per
-  // compound rtcp packet when single rtcp module is used for multiple media
-  // streams.
   result = receive_statistics_->RtcpReportBlocks(RTCP_MAX_REPORT_BLOCKS);
 
   if (!result.empty() && feedback_state.last_rr.Valid()) {
     // Get our NTP as late as possible to avoid a race.
     uint32_t now = CompactNtp(clock_->CurrentNtpTime());
     uint32_t receive_time = CompactNtp(feedback_state.last_rr);
-
     uint32_t delay_since_last_sr = now - receive_time;
-    // TODO(danilchap): Instead of setting same value on all report blocks,
-    // set only when media_ssrc match sender ssrc of the sender report
-    // remote times were taken from.
+
     for (auto& report_block : result) {
       report_block.SetLastSr(feedback_state.remote_sr);
       report_block.SetDelayLastSr(delay_since_last_sr);
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
index bb4f96b970..d32880e37e 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
@@ -64,8 +64,9 @@ struct RtcpTransceiverImpl::LocalSenderState {
 
 // Helper to put several RTCP packets into lower layer datagram composing
 // Compound or Reduced-Size RTCP packet, as defined by RFC 5506 section 2.
-// TODO(danilchap): When in compound mode and packets are so many that several
-// compound RTCP packets need to be generated, ensure each packet is compound.
+// TODO(bugs.webrtc.org/8239): When in compound mode and packets are so many
+// that several compound RTCP packets need to be generated, ensure each packet
+// is compound.
 class RtcpTransceiverImpl::PacketSender {
  public:
   PacketSender(rtcp::RtcpPacket::PacketReadyCallback callback,
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
index 8a3333d45c..5c147b1f34 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
@@ -155,8 +155,8 @@ class RtcpTransceiverImpl {
 
   bool ready_to_send_;
   absl::optional<rtcp::Remb> remb_;
-  // TODO(danilchap): Remove entries from remote_senders_ that are no longer
-  // needed.
+  // TODO(bugs.webrtc.org/8239): Remove entries from remote_senders_ that are no
+  // longer needed.
   flat_map<uint32_t, RemoteSenderState> remote_senders_;
   std::list<LocalSenderState> local_senders_;
   flat_map<uint32_t, std::list<LocalSenderState>::iterator>