diff --git a/schemas/2021-06-01/Microsoft.Cdn.json b/schemas/2021-06-01/Microsoft.Cdn.json
index dc5b6c0f22..c89dd0f9c2 100644
--- a/schemas/2021-06-01/Microsoft.Cdn.json
+++ b/schemas/2021-06-01/Microsoft.Cdn.json
@@ -932,17 +932,6 @@
           ],
           "description": "Round-Robin load balancing settings for a backend pool"
         },
-        "responseBasedAfdOriginErrorDetectionSettings": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ResponseBasedOriginErrorDetectionParameters"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The JSON object that contains the properties to determine origin health using real requests/responses."
-        },
         "sessionAffinityState": {
           "oneOf": [
             {
@@ -1006,7 +995,8 @@
         "enforceCertificateNameCheck": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "default": true
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3655,44 +3645,6 @@
       },
       "description": "Defines the list of managed rule sets for the policy."
     },
-    "ManagedServiceIdentity": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "SystemAssigned",
-                "UserAssigned",
-                "SystemAssigned, UserAssigned",
-                "None"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Type of managed service identity."
-        },
-        "userAssignedIdentities": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "$ref": "#/definitions/UserAssignedIdentity"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}"
-        }
-      },
-      "description": "Managed service identity."
-    },
     "MatchCondition": {
       "type": "object",
       "properties": {
@@ -4207,17 +4159,6 @@
     "ProfileProperties": {
       "type": "object",
       "properties": {
-        "identity": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ManagedServiceIdentity"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Managed service identity."
-        },
         "originResponseTimeoutSeconds": {
           "oneOf": [
             {
@@ -6955,11 +6896,6 @@
         "paramName"
       ],
       "description": "Defines how to identify a parameter for a specific purpose e.g. expires"
-    },
-    "UserAssignedIdentity": {
-      "type": "object",
-      "properties": {},
-      "description": "User Assigned identity."
     }
   }
 }
\ No newline at end of file