diff --git a/eng/config/OptProf.json b/eng/config/OptProf.json
index 0960a626445e4..5681ce0ade4b7 100644
--- a/eng/config/OptProf.json
+++ b/eng/config/OptProf.json
@@ -2,84 +2,7 @@
   "products": [
     {
       "name": "Roslyn.VisualStudio.Setup.vsix",
-      "tests": [
-        {
-          "container": "XamlOptProf",
-          "filteredTestCases": [
-            {
-              "filename": "/Microsoft.CodeAnalysis.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.CSharp.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.EditorFeatures.Text.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.VisualStudio.LanguageServices.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.VisualStudio.LanguageServices.Xaml.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.VisualBasic.Features.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.VisualBasic.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.Remote.Workspaces.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.EditorFeatures.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.CSharp.Features.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.Features.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.CSharp.Workspaces.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.VisualStudio.LanguageServices.Implementation.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.VisualStudio.LanguageServices.CSharp.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            },
-            {
-              "filename": "/Microsoft.CodeAnalysis.Workspaces.dll",
-              "testCases":[ "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated" ]
-            }
-          ]
-        },
+      "tests": [        
         {
           "container": "WinForms",
           "filteredTestCases": [
@@ -451,8 +374,7 @@
         {
           "container": "XamlOptProf",
           "testCases": [
-            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated",
-            "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated"
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated"
           ]
         }
       ]
@@ -495,8 +417,7 @@
         {
           "container": "XamlOptProf",
           "testCases": [
-            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated",
-            "Microsoft.Test.Performance.XamlOptProfCreateTests.WpfCreateProject_SurfaceIsolated"
+            "Microsoft.Test.Performance.XamlOptProfCreateTests.UwpCreateProject_SurfaceIsolated"
           ]
         }
       ]