diff --git a/schemas/2019-04-15/Microsoft.Cdn.json b/schemas/2019-04-15/Microsoft.Cdn.json
index aba2de194d..21b9c9dfb0 100644
--- a/schemas/2019-04-15/Microsoft.Cdn.json
+++ b/schemas/2019-04-15/Microsoft.Cdn.json
@@ -385,9 +385,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for Cookies match conditions"
     },
@@ -1399,7 +1397,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for HttpVersion match conditions"
@@ -1484,7 +1481,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for IsDevice match conditions"
@@ -1577,9 +1573,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for PostArgs match conditions"
     },
@@ -1770,7 +1764,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for QueryString match conditions"
@@ -1853,7 +1846,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RemoteAddress match conditions"
@@ -1942,7 +1934,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestBody match conditions"
@@ -2035,9 +2026,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for RequestHeader match conditions"
     },
@@ -2108,7 +2097,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestMethod match conditions"
@@ -2175,7 +2163,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestScheme match conditions "
@@ -2264,7 +2251,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestUri match conditions"
@@ -2379,7 +2365,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFileExtension match conditions"
@@ -2468,7 +2453,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFilename match conditions"
@@ -2558,7 +2542,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlPath match conditions"
diff --git a/schemas/2019-06-15/Microsoft.Cdn.json b/schemas/2019-06-15/Microsoft.Cdn.json
index 5693da1b64..f788606481 100644
--- a/schemas/2019-06-15/Microsoft.Cdn.json
+++ b/schemas/2019-06-15/Microsoft.Cdn.json
@@ -511,9 +511,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for Cookies match conditions"
     },
@@ -1641,7 +1639,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for HttpVersion match conditions"
@@ -1726,7 +1723,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for IsDevice match conditions"
@@ -2135,9 +2131,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for PostArgs match conditions"
     },
@@ -2328,7 +2322,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for QueryString match conditions"
@@ -2533,7 +2526,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RemoteAddress match conditions"
@@ -2622,7 +2614,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestBody match conditions"
@@ -2715,9 +2706,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for RequestHeader match conditions"
     },
@@ -2788,7 +2777,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestMethod match conditions"
@@ -2855,7 +2843,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestScheme match conditions "
@@ -2944,7 +2931,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestUri match conditions"
@@ -3059,7 +3045,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFileExtension match conditions"
@@ -3148,7 +3133,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFilename match conditions"
@@ -3238,7 +3222,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlPath match conditions"
diff --git a/schemas/2019-12-31/Microsoft.Cdn.json b/schemas/2019-12-31/Microsoft.Cdn.json
index b7aa70f3ae..7682054947 100644
--- a/schemas/2019-12-31/Microsoft.Cdn.json
+++ b/schemas/2019-12-31/Microsoft.Cdn.json
@@ -469,9 +469,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for Cookies match conditions"
     },
@@ -1721,7 +1719,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for HttpVersion match conditions"
@@ -1806,7 +1803,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for IsDevice match conditions"
@@ -2092,9 +2088,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for PostArgs match conditions"
     },
@@ -2363,7 +2357,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for QueryString match conditions"
@@ -2446,7 +2439,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RemoteAddress match conditions"
@@ -2535,7 +2527,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestBody match conditions"
@@ -2628,9 +2619,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for RequestHeader match conditions"
     },
@@ -2701,7 +2690,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestMethod match conditions"
@@ -2768,7 +2756,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestScheme match conditions "
@@ -2857,7 +2844,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestUri match conditions"
@@ -3031,7 +3017,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFileExtension match conditions"
@@ -3120,7 +3105,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFilename match conditions"
@@ -3210,7 +3194,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlPath match conditions"
diff --git a/schemas/2020-04-15/Microsoft.Cdn.json b/schemas/2020-04-15/Microsoft.Cdn.json
index b36d4e804b..3e347e4107 100644
--- a/schemas/2020-04-15/Microsoft.Cdn.json
+++ b/schemas/2020-04-15/Microsoft.Cdn.json
@@ -595,9 +595,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for Cookies match conditions"
     },
@@ -1993,7 +1991,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for HttpVersion match conditions"
@@ -2078,7 +2075,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for IsDevice match conditions"
@@ -2682,9 +2678,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for PostArgs match conditions"
     },
@@ -2953,7 +2947,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for QueryString match conditions"
@@ -3158,7 +3151,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RemoteAddress match conditions"
@@ -3247,7 +3239,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestBody match conditions"
@@ -3340,9 +3331,7 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
-        "operator",
-        "selector"
+        "operator"
       ],
       "description": "Defines the parameters for RequestHeader match conditions"
     },
@@ -3413,7 +3402,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestMethod match conditions"
@@ -3480,7 +3468,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestScheme match conditions "
@@ -3569,7 +3556,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for RequestUri match conditions"
@@ -3743,7 +3729,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFileExtension match conditions"
@@ -3832,7 +3817,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlFilename match conditions"
@@ -3922,7 +3906,6 @@
       },
       "required": [
         "@odata.type",
-        "matchValues",
         "operator"
       ],
       "description": "Defines the parameters for UrlPath match conditions"