diff --git a/media/OWNERS b/media/OWNERS
index 5d8ec5aba6..cf40b1c25d 100644
--- a/media/OWNERS
+++ b/media/OWNERS
@@ -8,6 +8,3 @@ perkj@webrtc.org
 # Audio-related changes:
 peah@webrtc.org
 saza@webrtc.org
-
-# Datachannel-related changes:
-orphis@webrtc.org
diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index 5f9c46a076..aaf14df41b 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc
@@ -1430,7 +1430,7 @@ webrtc::RTCError WebRtcVideoSendChannel::SetRtpSendParameters(
 
     // Since we validate that all layers have the same value, we can just check
     // the first layer.
-    // TODO(orphis): Support mixed-codec simulcast
+    // TODO: https://issues.webrtc.org/362277533 - Support mixed-codec simulcast
     if (parameters.encodings[0].codec && send_codec_ &&
         !IsSameRtpCodec(send_codec_->codec, *parameters.encodings[0].codec)) {
       RTC_LOG(LS_VERBOSE) << "Trying to change codec to "
diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc
index f63a887fad..bf652830f5 100644
--- a/media/engine/webrtc_voice_engine.cc
+++ b/media/engine/webrtc_voice_engine.cc
@@ -1926,7 +1926,7 @@ webrtc::RTCError WebRtcVoiceSendChannel::SetRtpSendParameters(
     std::optional<cricket::Codec> send_codec = GetSendCodec();
     // Since we validate that all layers have the same value, we can just check
     // the first layer.
-    // TODO(orphis): Support mixed-codec simulcast
+    // TODO: https://issues.webrtc.org/362277533 - Support mixed-codec simulcast
     if (parameters.encodings[0].codec && send_codec &&
         !send_codec->MatchesRtpCodec(*parameters.encodings[0].codec)) {
       RTC_LOG(LS_VERBOSE) << "Trying to change codec to "
diff --git a/media/sctp/OWNERS b/media/sctp/OWNERS
index da2f0178a8..489385182e 100644
--- a/media/sctp/OWNERS
+++ b/media/sctp/OWNERS
@@ -1,3 +1,2 @@
 boivie@webrtc.org
 deadbeef@webrtc.org
-orphis@webrtc.org
diff --git a/pc/OWNERS b/pc/OWNERS
index 8ceb1f6c63..4b662f76a0 100644
--- a/pc/OWNERS
+++ b/pc/OWNERS
@@ -3,7 +3,6 @@ hta@webrtc.org
 perkj@webrtc.org
 tommi@webrtc.org
 deadbeef@webrtc.org
-orphis@webrtc.org
 
 # Adding features via SDP munging requires approval from SDP owners
 per-file webrtc_sdp.cc = set noparent