diff --git a/schemas/2018-10-31-preview/Microsoft.HardwareSecurityModules.json b/schemas/2018-10-31-preview/Microsoft.HardwareSecurityModules.json
index 94bf56ae99..0f78540f8a 100644
--- a/schemas/2018-10-31-preview/Microsoft.HardwareSecurityModules.json
+++ b/schemas/2018-10-31-preview/Microsoft.HardwareSecurityModules.json
@@ -48,8 +48,7 @@
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
-          ],
-          "description": "SKU of the dedicated HSM"
+          ]
         },
         "tags": {
           "oneOf": [
@@ -176,13 +175,7 @@
             {
               "type": "string",
               "enum": [
-                "SafeNet Luna Network HSM A790",
-                "payShield10K_LMK1_CPS60",
-                "payShield10K_LMK1_CPS250",
-                "payShield10K_LMK1_CPS2500",
-                "payShield10K_LMK2_CPS60",
-                "payShield10K_LMK2_CPS250",
-                "payShield10K_LMK2_CPS2500"
+                "SafeNet Luna Network HSM A790"
               ]
             },
             {
@@ -191,8 +184,7 @@
           ],
           "description": "SKU of the dedicated HSM."
         }
-      },
-      "description": "SKU of the dedicated HSM"
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/schemas/2021-11-30/Microsoft.HardwareSecurityModules.json b/schemas/2021-11-30/Microsoft.HardwareSecurityModules.json
deleted file mode 100644
index d66fea1886..0000000000
--- a/schemas/2021-11-30/Microsoft.HardwareSecurityModules.json
+++ /dev/null
@@ -1,280 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2021-11-30/Microsoft.HardwareSecurityModules.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.HardwareSecurityModules",
-  "description": "Microsoft HardwareSecurityModules Resource Types",
-  "resourceDefinitions": {
-    "dedicatedHSMs": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2021-11-30"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The supported Azure location where the dedicated HSM should be created."
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^[a-zA-Z0-9-]{3,24}$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Name of the dedicated Hsm"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DedicatedHsmProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Properties of the dedicated hsm"
-        },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Sku"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "SKU of the dedicated HSM"
-        },
-        "systemData": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/SystemData"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Metadata pertaining to creation and last modification of dedicated hsm resource."
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Resource tags"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.HardwareSecurityModules/dedicatedHSMs"
-          ]
-        },
-        "zones": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The Dedicated Hsm zones."
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.HardwareSecurityModules/dedicatedHSMs"
-    }
-  },
-  "definitions": {
-    "ApiEntityReference": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "The ARM resource id in the form of /subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroupName}/..."
-        }
-      },
-      "description": "The API entity reference."
-    },
-    "DedicatedHsmProperties": {
-      "type": "object",
-      "properties": {
-        "managementNetworkProfile": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/NetworkProfile"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The network profile definition."
-        },
-        "networkProfile": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/NetworkProfile"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The network profile definition."
-        },
-        "stampId": {
-          "type": "string",
-          "description": "This field will be used when RP does not support Availability zones."
-        }
-      },
-      "description": "Properties of the dedicated hsm"
-    },
-    "NetworkInterface": {
-      "type": "object",
-      "properties": {
-        "privateIpAddress": {
-          "type": "string",
-          "description": "Private Ip address of the interface"
-        }
-      },
-      "description": "The network interface definition."
-    },
-    "NetworkProfile": {
-      "type": "object",
-      "properties": {
-        "networkInterfaces": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/NetworkInterface"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Specifies the list of resource Ids for the network interfaces associated with the dedicated HSM."
-        },
-        "subnet": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/ApiEntityReference"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The API entity reference."
-        }
-      },
-      "description": "The network profile definition."
-    },
-    "Sku": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "SafeNet Luna Network HSM A790",
-                "payShield10K_LMK1_CPS60",
-                "payShield10K_LMK1_CPS250",
-                "payShield10K_LMK1_CPS2500",
-                "payShield10K_LMK2_CPS60",
-                "payShield10K_LMK2_CPS250",
-                "payShield10K_LMK2_CPS2500"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "SKU of the dedicated HSM."
-        }
-      },
-      "description": "SKU of the dedicated HSM"
-    },
-    "SystemData": {
-      "type": "object",
-      "properties": {
-        "createdAt": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The timestamp of dedicated hsm resource creation (UTC)."
-        },
-        "createdBy": {
-          "type": "string",
-          "description": "The identity that created dedicated hsm resource."
-        },
-        "createdByType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "User",
-                "Application",
-                "ManagedIdentity",
-                "Key"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The type of identity that created dedicated hsm resource."
-        },
-        "lastModifiedAt": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The timestamp of dedicated hsm resource last modification (UTC)."
-        },
-        "lastModifiedBy": {
-          "type": "string",
-          "description": "The identity that last modified dedicated hsm resource."
-        },
-        "lastModifiedByType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "User",
-                "Application",
-                "ManagedIdentity",
-                "Key"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The type of identity that last modified dedicated hsm resource."
-        }
-      },
-      "description": "Metadata pertaining to creation and last modification of dedicated hsm resource."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 6a2d2982f8..35e8fe914e 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -8296,9 +8296,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2018-10-31-preview/Microsoft.HardwareSecurityModules.json#/resourceDefinitions/dedicatedHSMs"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2021-11-30/Microsoft.HardwareSecurityModules.json#/resourceDefinitions/dedicatedHSMs"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2015-03-01-preview/Microsoft.HDInsight.json#/resourceDefinitions/clusters"
         },