diff --git a/api/ortc/ortcfactoryinterface.h b/api/ortc/ortcfactoryinterface.h
index ea25c8a3cb..9937352831 100644
--- a/api/ortc/ortcfactoryinterface.h
+++ b/api/ortc/ortcfactoryinterface.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <utility>  // For std::move.
 
-#include "api/mediaconstraintsinterface.h"
 #include "api/mediastreaminterface.h"
 #include "api/mediatypes.h"
 #include "api/ortc/ortcrtpreceiverinterface.h"
@@ -25,6 +24,7 @@
 #include "api/ortc/rtptransportinterface.h"
 #include "api/ortc/srtptransportinterface.h"
 #include "api/ortc/udptransportinterface.h"
+#include "api/peerconnectioninterface.h"
 #include "api/rtcerror.h"
 #include "api/rtpparameters.h"
 #include "rtc_base/network.h"
diff --git a/api/peerconnectioninterface.cc b/api/peerconnectioninterface.cc
index 05aa53f15b..b4148d7480 100644
--- a/api/peerconnectioninterface.cc
+++ b/api/peerconnectioninterface.cc
@@ -192,16 +192,6 @@ PeerConnectionFactoryDependencies::PeerConnectionFactoryDependencies(
 PeerConnectionFactoryDependencies::~PeerConnectionFactoryDependencies() =
     default;
 
-rtc::scoped_refptr<PeerConnectionInterface>
-PeerConnectionFactoryInterface::CreatePeerConnection(
-    const PeerConnectionInterface::RTCConfiguration& configuration,
-    const MediaConstraintsInterface* constraints,
-    std::unique_ptr<cricket::PortAllocator> allocator,
-    std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
-    PeerConnectionObserver* observer) {
-  return nullptr;
-}
-
 rtc::scoped_refptr<PeerConnectionInterface>
 PeerConnectionFactoryInterface::CreatePeerConnection(
     const PeerConnectionInterface::RTCConfiguration& configuration,
diff --git a/api/peerconnectioninterface.h b/api/peerconnectioninterface.h
index 2b94ee8ad5..1c32b69692 100644
--- a/api/peerconnectioninterface.h
+++ b/api/peerconnectioninterface.h
@@ -1233,15 +1233,6 @@ class PeerConnectionFactoryInterface : public rtc::RefCountInterface {
       std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
       PeerConnectionObserver* observer);
 
-  // Deprecated; should use RTCConfiguration for everything that previously
-  // used constraints.
-  virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
-      const PeerConnectionInterface::RTCConfiguration& configuration,
-      const MediaConstraintsInterface* constraints,
-      std::unique_ptr<cricket::PortAllocator> allocator,
-      std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator,
-      PeerConnectionObserver* observer);
-
   // Returns the capabilities of an RTP sender of type |kind|.
   // If for some reason you pass in MEDIA_TYPE_DATA, returns an empty structure.
   // TODO(orphis): Make pure virtual when all subclasses implement it.
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 58ca741033..2e040decd8 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -88,18 +88,12 @@ class MockPeerConnectionInterface
                      const SessionDescriptionInterface*());
   MOCK_CONST_METHOD0(pending_remote_description,
                      const SessionDescriptionInterface*());
-  MOCK_METHOD2(CreateOffer,
-               void(CreateSessionDescriptionObserver*,
-                    const MediaConstraintsInterface*));
   MOCK_METHOD2(CreateOffer,
                void(CreateSessionDescriptionObserver*,
                     const RTCOfferAnswerOptions&));
   MOCK_METHOD2(CreateAnswer,
                void(CreateSessionDescriptionObserver*,
                     const RTCOfferAnswerOptions&));
-  MOCK_METHOD2(CreateAnswer,
-               void(CreateSessionDescriptionObserver*,
-                    const MediaConstraintsInterface*));
   MOCK_METHOD2(SetLocalDescription,
                void(SetSessionDescriptionObserver*,
                     SessionDescriptionInterface*));
diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc
index 7bc25706f0..6c543f90ef 100644
--- a/pc/peerconnection.cc
+++ b/pc/peerconnection.cc
@@ -20,7 +20,6 @@
 #include "absl/memory/memory.h"
 #include "api/jsepicecandidate.h"
 #include "api/jsepsessiondescription.h"
-#include "api/mediaconstraintsinterface.h"
 #include "api/mediastreamproxy.h"
 #include "api/mediastreamtrackproxy.h"
 #include "call/call.h"
diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
index cc97e4ef7d..d9fa1d5abd 100644
--- a/pc/peerconnection_integrationtest.cc
+++ b/pc/peerconnection_integrationtest.cc
@@ -85,7 +85,6 @@ using webrtc::DtmfSender;
 using webrtc::DtmfSenderInterface;
 using webrtc::DtmfSenderObserverInterface;
 using webrtc::FakeVideoTrackRenderer;
-using webrtc::MediaConstraintsInterface;
 using webrtc::MediaStreamInterface;
 using webrtc::MediaStreamTrackInterface;
 using webrtc::MockCreateSessionDescriptionObserver;
diff --git a/pc/peerconnectionendtoend_unittest.cc b/pc/peerconnectionendtoend_unittest.cc
index 427529c2c9..60da2d242c 100644
--- a/pc/peerconnectionendtoend_unittest.cc
+++ b/pc/peerconnectionendtoend_unittest.cc
@@ -40,7 +40,6 @@ using testing::_;
 
 using webrtc::DataChannelInterface;
 using webrtc::FakeConstraints;
-using webrtc::MediaConstraintsInterface;
 using webrtc::MediaStreamInterface;
 using webrtc::PeerConnectionInterface;
 using webrtc::SdpSemantics;
diff --git a/pc/peerconnectioninterface_unittest.cc b/pc/peerconnectioninterface_unittest.cc
index 2f6c0efbe0..719fdbdd7f 100644
--- a/pc/peerconnectioninterface_unittest.cc
+++ b/pc/peerconnectioninterface_unittest.cc
@@ -417,7 +417,6 @@ using webrtc::AudioTrackInterface;
 using webrtc::DataBuffer;
 using webrtc::DataChannelInterface;
 using webrtc::IceCandidateInterface;
-using webrtc::MediaConstraintsInterface;
 using webrtc::MediaStream;
 using webrtc::MediaStreamInterface;
 using webrtc::MediaStreamTrackInterface;
diff --git a/pc/test/mock_peerconnection.h b/pc/test/mock_peerconnection.h
index d8cb5e381b..0a75b14772 100644
--- a/pc/test/mock_peerconnection.h
+++ b/pc/test/mock_peerconnection.h
@@ -118,18 +118,12 @@ class MockPeerConnection
                      const SessionDescriptionInterface*());
   MOCK_CONST_METHOD0(pending_remote_description,
                      const SessionDescriptionInterface*());
-  MOCK_METHOD2(CreateOffer,
-               void(CreateSessionDescriptionObserver*,
-                    const MediaConstraintsInterface*));
   MOCK_METHOD2(CreateOffer,
                void(CreateSessionDescriptionObserver*,
                     const RTCOfferAnswerOptions&));
   MOCK_METHOD2(CreateAnswer,
                void(CreateSessionDescriptionObserver*,
                     const RTCOfferAnswerOptions&));
-  MOCK_METHOD2(CreateAnswer,
-               void(CreateSessionDescriptionObserver*,
-                    const MediaConstraintsInterface*));
   MOCK_METHOD2(SetLocalDescription,
                void(SetSessionDescriptionObserver*,
                     SessionDescriptionInterface*));
diff --git a/pc/test/peerconnectiontestwrapper.cc b/pc/test/peerconnectiontestwrapper.cc
index fc699d3143..03dabb554e 100644
--- a/pc/test/peerconnectiontestwrapper.cc
+++ b/pc/test/peerconnectiontestwrapper.cc
@@ -26,7 +26,6 @@
 using webrtc::FakeConstraints;
 using webrtc::FakeVideoTrackRenderer;
 using webrtc::IceCandidateInterface;
-using webrtc::MediaConstraintsInterface;
 using webrtc::MediaStreamInterface;
 using webrtc::MediaStreamTrackInterface;
 using webrtc::MockSetSessionDescriptionObserver;
diff --git a/pc/webrtcsessiondescriptionfactory.cc b/pc/webrtcsessiondescriptionfactory.cc
index 22551437e3..808e411a39 100644
--- a/pc/webrtcsessiondescriptionfactory.cc
+++ b/pc/webrtcsessiondescriptionfactory.cc
@@ -18,7 +18,6 @@
 #include "absl/memory/memory.h"
 #include "api/jsep.h"
 #include "api/jsepsessiondescription.h"
-#include "api/mediaconstraintsinterface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/sslidentity.h"