diff --git a/pc/channel.cc b/pc/channel.cc
index 03e63b0224..f83f5cdd9a 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -101,13 +101,8 @@ void RtpParametersFromMediaDescription(
     bool is_stream_active,
     RtpParameters<Codec>* params) {
   params->is_stream_active = is_stream_active;
-  // TODO(pthatcher): Remove this once we're sure no one will give us
-  // a description without codecs. Currently the ORTC implementation is relying
-  // on this.
-  if (desc->has_codecs()) {
-    params->codecs = desc->codecs();
-  }
-  // TODO(pthatcher): See if we really need
+  params->codecs = desc->codecs();
+  // TODO(bugs.webrtc.org/11513): See if we really need
   // rtp_header_extensions_set() and remove it if we don't.
   if (desc->rtp_header_extensions_set()) {
     params->extensions = extensions;
diff --git a/pc/session_description.h b/pc/session_description.h
index 901abc5984..bfd19b8c7a 100644
--- a/pc/session_description.h
+++ b/pc/session_description.h
@@ -291,10 +291,6 @@ class MediaContentDescription {
   virtual MediaContentDescription* CloneInternal() const = 0;
 };
 
-// TODO(bugs.webrtc.org/8620): Remove this alias once downstream projects have
-// updated.
-using ContentDescription = MediaContentDescription;
-
 template <class C>
 class MediaContentDescriptionImpl : public MediaContentDescription {
  public:
@@ -429,10 +425,6 @@ enum class MediaProtocolType {
          // https://tools.ietf.org/html/rfc4960
 };
 
-// TODO(bugs.webrtc.org/8620): Remove once downstream projects have updated.
-constexpr MediaProtocolType NS_JINGLE_RTP = MediaProtocolType::kRtp;
-constexpr MediaProtocolType NS_JINGLE_DRAFT_SCTP = MediaProtocolType::kSctp;
-
 // Represents a session description section. Most information about the section
 // is stored in the description, which is a subclass of MediaContentDescription.
 // Owns the description.