diff --git a/eng/config/OptProf.json b/eng/config/OptProf.json
index ea7d3ad75452b71fa93a74dd30df4c7a5dba8f3a..b9e3eb813380d1e3f7b184bfe5258de43a83f76d 100644
--- a/eng/config/OptProf.json
+++ b/eng/config/OptProf.json
@@ -3,33 +3,18 @@
     {
       "name": "Roslyn.VisualStudio.Setup.vsix",
       "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner",
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        },
         {
           "container": "TeamEng",
           "testCases": [
-            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
             "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
           ]
         },
-        {
-          "container": "VSLanguages",
-          "testCases": [
-            "VSLanguages.Managed.vs_perf_DesignTime_editor_navigate_NavigateTo_cs"
-          ]
-        },
         {
           "container": "VSPE",
           "testCases": [
             "VSPE.OptProfTests.vs_asl_cs_scenario",
             "VSPE.OptProfTests.vs_asl_vb_scenario",
             "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
-            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp",
             "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
             "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
             "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
@@ -55,17 +40,9 @@
     {
       "name": "ExpressionEvaluatorPackage.vsix",
       "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner",
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        },
         {
           "container": "TeamEng",
           "testCases": [
-            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
             "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
           ]
         }
@@ -74,17 +51,9 @@
     {
       "name": "Microsoft.CodeAnalysis.Compilers.vsix",
       "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner",
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        },
         {
           "container": "TeamEng",
           "testCases": [
-            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
             "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
           ]
         },
@@ -95,18 +64,6 @@
           ]
         }
       ]
-    },
-    {
-      "name": "Roslyn.VisualStudio.InteractiveComponents.vsix",
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner",
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
     }
   ],
   "assemblies": [
@@ -119,33 +76,18 @@
         }
       ],
       "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner",
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        },
         {
           "container": "TeamEng",
           "testCases": [
-            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
             "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
           ]
         },
-        {
-          "container": "VSLanguages",
-          "testCases": [
-            "VSLanguages.Managed.vs_perf_DesignTime_editor_navigate_NavigateTo_cs"
-          ]
-        },
         {
           "container": "VSPE",
           "testCases": [
             "VSPE.OptProfTests.vs_asl_cs_scenario",
             "VSPE.OptProfTests.vs_asl_vb_scenario",
             "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
-            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp",
             "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
             "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
             "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
@@ -177,33 +119,18 @@
         }
       ],
       "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner",
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        },
         {
           "container": "TeamEng",
           "testCases": [
-            "TeamEng.OptProfTest.vs_debugger_interop_managedclient",
             "TeamEng.OptProfTest.vs_debugger_start_no_build_cs_scribble"
           ]
         },
-        {
-          "container": "VSLanguages",
-          "testCases": [
-            "VSLanguages.Managed.vs_perf_DesignTime_editor_navigate_NavigateTo_cs"
-          ]
-        },
         {
           "container": "VSPE",
           "testCases": [
             "VSPE.OptProfTests.vs_asl_cs_scenario",
             "VSPE.OptProfTests.vs_asl_vb_scenario",
             "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
-            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp",
             "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
             "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
             "VSPE.OptProfTests.vs_perf_designtime_solution_build_vb_australiangovernment",
@@ -225,125 +152,6 @@
           ]
         }
       ]
-    },
-    {
-      "assembly": "Microsoft.Build.Conversion.Core.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
-    },
-    {
-      "assembly": "Microsoft.Build.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
-    },
-    {
-      "assembly": "Microsoft.Build.Engine.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
-    },
-    {
-      "assembly": "Microsoft.Build.Framework.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
-    },
-    {
-      "assembly": "Microsoft.Build.Tasks.Core.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
-    },
-    {
-      "assembly": "Microsoft.Build.Utilities.Core.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
-    },
-    {
-      "assembly": "System.Threading.Tasks.Dataflow.dll",
-      "instrumentationArguments": [
-        {
-          "relativeInstallationFolder": "MSBuild/Current/Bin",
-          "instrumentationExecutable": "Common7/IDE/vsn.exe"
-        }
-      ],
-      "tests": [
-        {
-          "container": "DDRIT.RPS.CSharp",
-          "testCases": [
-            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
-          ]
-        }
-      ]
     }
   ]
 }
\ No newline at end of file