diff --git a/test/frame_generator.h b/test/frame_generator.h
index d12072ae8c..5728cfa032 100644
--- a/test/frame_generator.h
+++ b/test/frame_generator.h
@@ -59,8 +59,11 @@ class FrameGenerator {
   }
 
   enum class OutputType { I420, I420A };
+
   // Creates a frame generator that produces frames with small squares that
   // move randomly towards the lower right corner.
+  // |type| has the default value OutputType::I420. |num_squares| has the
+  // default value 10.
   static std::unique_ptr<FrameGenerator> CreateSquareGenerator(
       int width,
       int height,
diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
index cf0fd285c0..a9e80d78ca 100644
--- a/test/frame_generator_capturer.cc
+++ b/test/frame_generator_capturer.cc
@@ -101,14 +101,6 @@ FrameGeneratorCapturer* FrameGeneratorCapturer::Create(
   return capturer.release();
 }
 
-FrameGeneratorCapturer* FrameGeneratorCapturer::Create(int width,
-                                                       int height,
-                                                       int num_squares,
-                                                       int target_fps,
-                                                       Clock* clock) {
-  return Create(width, height, rtc::nullopt, num_squares, target_fps, clock);
-}
-
 FrameGeneratorCapturer* FrameGeneratorCapturer::CreateFromYuvFile(
     const std::string& file_name,
     size_t width,
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index 7d478a8391..6213c090f0 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -41,6 +41,8 @@ class FrameGeneratorCapturer : public VideoCapturer {
     virtual ~SinkWantsObserver() {}
   };
 
+  // |type| has the default value OutputType::I420. |num_squares| has the
+  // default value 10.
   static FrameGeneratorCapturer* Create(
       int width,
       int height,
@@ -49,14 +51,6 @@ class FrameGeneratorCapturer : public VideoCapturer {
       int target_fps,
       Clock* clock);
 
-  // TODO(emircan): Update all clients and delete this function in favor of the
-  // above Create() signature.
-  static FrameGeneratorCapturer* Create(int width,
-                                        int height,
-                                        int num_squares,
-                                        int target_fps,
-                                        Clock* clock);
-
   static FrameGeneratorCapturer* CreateFromYuvFile(const std::string& file_name,
                                                    size_t width,
                                                    size_t height,