diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
index 76f99faa8..882a16e30 100644
--- a/webrtc/tools/BUILD.gn
+++ b/webrtc/tools/BUILD.gn
@@ -16,50 +16,12 @@ source_set("tools") {
 
 source_set("command_line_parser") {
   sources = [
-    "simple_command_line_parser.cc",
     "simple_command_line_parser.h",
-  ]
-  deps = [
-    "..:gtest_prod",
+    "simple_command_line_parser.cc",
   ]
 
   configs += [ "..:common_config" ]
-  public_configs = [ "..:common_inherited_config" ]
-}
-
-source_set("video_quality_analysis") {
-  sources = [
-    "frame_analyzer/video_quality_analysis.cc",
-    "frame_analyzer/video_quality_analysis.h",
-  ]
-  deps = [
-    "../common_video",
-  ]
-  public_deps = [
-    "../common_video",
-  ]
-}
-
-executable("frame_analyzer") {
-  sources = [
-    "frame_analyzer/frame_analyzer.cc",
-  ]
-  deps = [
-    ":command_line_parser",
-    ":video_quality_analysis",
-  ]
-}
-
-executable("rgba_to_i420_converter") {
-  sources = [
-    "converter/converter.cc",
-    "converter/converter.h",
-    "converter/rgba_to_i420_converter.cc",
-  ]
-  deps = [
-    ":command_line_parser",
-    "../common_video",
-  ]
+  public_configs = [ "..:common_inherited_config"]
 }
 
 # TODO(kjellander): Convert all of tools.gyp into GN here.
@@ -73,7 +35,7 @@ if (!build_with_chromium) {
     ]
 
     configs += [ "..:common_config" ]
-    public_configs = [ "..:common_inherited_config" ]
+    public_configs = [ "..:common_inherited_config"]
 
     deps = [
       ":command_line_parser",
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.cc b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
index 5c707bb6e..f5608c834 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.cc
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.cc
@@ -26,9 +26,6 @@ namespace test {
 
 using std::string;
 
-ResultsContainer::ResultsContainer() {}
-ResultsContainer::~ResultsContainer() {}
-
 int GetI420FrameSize(int width, int height) {
   int half_width = (width + 1) >> 1;
   int half_height = (height + 1) >> 1;
diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis.h b/webrtc/tools/frame_analyzer/video_quality_analysis.h
index 49b6f1210..4704a8cde 100644
--- a/webrtc/tools/frame_analyzer/video_quality_analysis.h
+++ b/webrtc/tools/frame_analyzer/video_quality_analysis.h
@@ -32,9 +32,6 @@ struct AnalysisResult {
 };
 
 struct ResultsContainer {
-  ResultsContainer();
-  ~ResultsContainer();
-
   std::vector<AnalysisResult> frames;
 };
 
diff --git a/webrtc/tools/internal_tools.gyp b/webrtc/tools/internal_tools.gyp
index 40dc371a0..9d5fe25da 100644
--- a/webrtc/tools/internal_tools.gyp
+++ b/webrtc/tools/internal_tools.gyp
@@ -20,9 +20,6 @@
         'simple_command_line_parser.h',
         'simple_command_line_parser.cc',
       ],
-      'deps': [
-        '<(webrtc_root)/common.gyp:gtest_prod',
-      ],
     }, # command_line_parser
   ],
-}
+}
\ No newline at end of file