diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
index 963b5f6bf9..60ab868a7c 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
@@ -49,12 +49,8 @@ class PeerConnectionDelegateAdapter : public PeerConnectionObserver {
   void OnIceCandidatesRemoved(
       const std::vector<cricket::Candidate>& candidates) override;
 
-  void OnAddTrack(
-      rtc::scoped_refptr<RtpReceiverInterface> receiver,
-      const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams) override;
-
  private:
-  __weak RTCPeerConnection* peer_connection_;
+  __weak RTCPeerConnection *peer_connection_;
 };
 
 } // namespace webrtc
@@ -106,11 +102,6 @@ class PeerConnectionDelegateAdapter : public PeerConnectionObserver {
 + (webrtc::PeerConnectionInterface::StatsOutputLevel)
     nativeStatsOutputLevelForLevel:(RTCStatsOutputLevel)level;
 
-- (RTCMediaStream *)mediaStreamForNativeStream:
-    (rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream;
-
-- (void)removeNativeMediaStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
index e9428d3b95..de7608c3b9 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
@@ -27,7 +27,6 @@
 
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
 
 NSString * const kRTCPeerConnectionErrorDomain =
     @"org.webrtc.RTCPeerConnection";
@@ -128,8 +127,9 @@ void PeerConnectionDelegateAdapter::OnSignalingChange(
 
 void PeerConnectionDelegateAdapter::OnAddStream(
     rtc::scoped_refptr<MediaStreamInterface> stream) {
+  RTCMediaStream *mediaStream =
+      [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
   RTCPeerConnection *peer_connection = peer_connection_;
-  RTCMediaStream *mediaStream = [peer_connection mediaStreamForNativeStream:stream];
   [peer_connection.delegate peerConnection:peer_connection
                               didAddStream:mediaStream];
 }
@@ -141,7 +141,6 @@ void PeerConnectionDelegateAdapter::OnRemoveStream(
   RTCPeerConnection *peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                            didRemoveStream:mediaStream];
-  [peer_connection removeNativeMediaStream:stream];
 }
 
 void PeerConnectionDelegateAdapter::OnDataChannel(
@@ -201,28 +200,6 @@ void PeerConnectionDelegateAdapter::OnIceCandidatesRemoved(
                     didRemoveIceCandidates:ice_candidates];
 }
 
-void PeerConnectionDelegateAdapter::OnAddTrack(
-    rtc::scoped_refptr<RtpReceiverInterface> receiver,
-    const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams) {
-  RTCRtpReceiver* rtpReceiver =
-      [[RTCRtpReceiver alloc] initWithNativeRtpReceiver:receiver];
-  NSMutableArray* mediaStreams =
-      [NSMutableArray arrayWithCapacity:streams.size()];
-
-  RTCPeerConnection* peer_connection = peer_connection_;
-  for (const auto stream : streams) {
-    RTCMediaStream* mediaStream =
-        [peer_connection mediaStreamForNativeStream:stream];
-    [mediaStreams addObject:mediaStream];
-  }
-  if ([peer_connection.delegate
-      respondsToSelector:@selector(peerConnection:didAddTrack:streams:)]) {
-    [peer_connection.delegate peerConnection:peer_connection
-                                 didAddTrack:rtpReceiver
-                                     streams:mediaStreams];
-  }
-}
-
 }  // namespace webrtc
 
 
@@ -232,7 +209,6 @@ void PeerConnectionDelegateAdapter::OnAddTrack(
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> _peerConnection;
   std::unique_ptr<webrtc::MediaConstraints> _nativeConstraints;
   BOOL _hasStartedRtcEventLog;
-  NSMutableDictionary<NSString *, RTCMediaStream *> *_mediaStreamsByStreamId;
 }
 
 @synthesize delegate = _delegate;
@@ -262,7 +238,6 @@ void PeerConnectionDelegateAdapter::OnAddTrack(
     }
     _localStreams = [[NSMutableArray alloc] init];
     _delegate = delegate;
-    _mediaStreamsByStreamId = [NSMutableDictionary dictionary];
   }
   return self;
 }
@@ -613,21 +588,6 @@ void PeerConnectionDelegateAdapter::OnAddTrack(
   }
 }
 
-- (RTCMediaStream *)mediaStreamForNativeStream:
-    (rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream {
-  RTCMediaStream *mediaStream =
-      _mediaStreamsByStreamId[[NSString stringForStdString:stream->label()]];
-  if (!mediaStream) {
-    mediaStream = [[RTCMediaStream alloc] initWithNativeMediaStream:stream.get()];
-    _mediaStreamsByStreamId[[NSString stringForStdString:stream->label()]] = mediaStream;
-  }
-  return mediaStream;
-}
-
-- (void)removeNativeMediaStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream {
-  [_mediaStreamsByStreamId removeObjectForKey:[NSString stringForStdString:stream->label()]];
-}
-
 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
   return _peerConnection;
 }
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
index 785dccff91..4438eb28ab 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCPeerConnection.h
@@ -106,14 +106,6 @@ RTC_EXPORT
 - (void)peerConnection:(RTCPeerConnection *)peerConnection
     didOpenDataChannel:(RTCDataChannel *)dataChannel;
 
-@optional
-/** Called when a new track is signaled from remote peer. The new track is
- * attached to the RtpReceiver.
- * TODO(zhihuang): Remove the @optional once the downstream applitions implement this method.*/
-- (void)peerConnection:(RTCPeerConnection *)peerConnection
-           didAddTrack:(RTCRtpReceiver *)rtpReceiver
-               streams:(NSArray<RTCMediaStream *> *)mediaStreams;
-
 @end
 
 RTC_EXPORT