diff --git a/api/video_codecs/video_encoder_factory.h b/api/video_codecs/video_encoder_factory.h
index b1bf3fd8c5..d7cea47909 100644
--- a/api/video_codecs/video_encoder_factory.h
+++ b/api/video_codecs/video_encoder_factory.h
@@ -27,10 +27,6 @@ class VideoEncoder;
 // NOTE: This class is still under development and may change without notice.
 class VideoEncoderFactory {
  public:
-  // TODO(magjed): Try to get rid of this struct.
-  struct CodecInfo {
-  };
-
   struct CodecSupport {
     bool is_supported = false;
     bool is_power_efficient = false;
@@ -68,16 +64,6 @@ class VideoEncoderFactory {
     return GetSupportedFormats();
   }
 
-  // Returns information about how this format will be encoded. The specified
-  // format must be one of the supported formats by this factory.
-
-  // TODO(magjed): Try to get rid of this method. Since is_hardware_accelerated
-  // is unused, only factories producing internal source encoders (in itself a
-  // deprecated feature) needs to override this method.
-  virtual CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const {
-    return CodecInfo();
-  }
-
   // Query whether the specifed format is supported or not and if it will be
   // power efficient, which is currently interpreted as if there is support for
   // hardware acceleration.
diff --git a/test/peer_scenario/peer_scenario_client.cc b/test/peer_scenario/peer_scenario_client.cc
index 7692b8afa0..385c96d5c6 100644
--- a/test/peer_scenario/peer_scenario_client.cc
+++ b/test/peer_scenario/peer_scenario_client.cc
@@ -174,6 +174,7 @@ class FakeVideoEncoderFactory : public VideoEncoderFactory {
   }
   std::unique_ptr<VideoEncoder> CreateVideoEncoder(
       const SdpVideoFormat& format) override {
+    RTC_CHECK_EQ(format.name, "VP8");
     return std::make_unique<FakeVp8Encoder>(clock_);
   }