diff --git a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/customAssessmentAutomation.json b/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/customAssessmentAutomation.json
deleted file mode 100644
index ff1caa449974..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/customAssessmentAutomation.json
+++ /dev/null
@@ -1,435 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Security Center",
-    "description": "API spec for Microsoft.Security (Azure Security Center) resource provider",
-    "version": "2021-07-01-preview"
-  },
-  "host": "management.azure.com",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "security": [
-    {
-      "azure_auth": [
-        "user_impersonation"
-      ]
-    }
-  ],
-  "securityDefinitions": {
-    "azure_auth": {
-      "type": "oauth2",
-      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
-      "flow": "implicit",
-      "description": "Azure Active Directory OAuth2 Flow",
-      "scopes": {
-        "user_impersonation": "impersonate your user account"
-      }
-    }
-  },
-  "paths": {
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customAssessmentAutomations/{customAssessmentAutomationName}": {
-      "get": {
-        "summary": "Gets a custom assessment automation",
-        "description": "Gets a single custom assessment automation by name for the provided subscription and resource group.",
-        "tags": [
-          "customAssessmentAutomations"
-        ],
-        "operationId": "CustomAssessmentAutomations_Get",
-        "parameters": [
-          {
-            "$ref": "./common/v1/types.json#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/customAssessmentAutomationName"
-          }
-        ],
-        "x-ms-examples": {
-          "Get a Custom Assessment Automation": {
-            "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json"
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "$ref": "#/definitions/customAssessmentAutomation"
-            }
-          },
-          "default": {
-            "description": "Error response describing why the operation failed.",
-            "schema": {
-              "$ref": "./common/v1/types.json#/definitions/CloudError"
-            }
-          }
-        }
-      },
-      "put": {
-        "summary": "Creates a custom assessment automation",
-        "description": "Creates or updates a custom assessment automation for the provided subscription. Please note that providing an existing custom assessment automation will replace the existing record.",
-        "tags": [
-          "customAssessmentAutomations"
-        ],
-        "operationId": "CustomAssessmentAutomations_Create",
-        "parameters": [
-          {
-            "$ref": "./common/v1/types.json#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/customAssessmentAutomationName"
-          },
-          {
-            "$ref": "#/parameters/customAssessmentAutomationBody"
-          }
-        ],
-        "x-ms-examples": {
-          "Create a Custom Assessment Automation": {
-            "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json"
-          }
-        },
-        "responses": {
-          "201": {
-            "description": "Created",
-            "schema": {
-              "$ref": "#/definitions/customAssessmentAutomation"
-            }
-          },
-          "200": {
-            "description": "OK - Updated",
-            "schema": {
-              "$ref": "#/definitions/customAssessmentAutomation"
-            }
-          },
-          "default": {
-            "description": "Error response describing why the operation failed.",
-            "schema": {
-              "$ref": "./common/v1/types.json#/definitions/CloudError"
-            }
-          }
-        }
-      },
-      "delete": {
-        "summary": "Deletes a custom assessment automation",
-        "description": "Deletes a custom assessment automation by name for a provided subscription",
-        "tags": [
-          "customAssessmentAutomations"
-        ],
-        "operationId": "CustomAssessmentAutomations_Delete",
-        "parameters": [
-          {
-            "$ref": "./common/v1/types.json#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/ResourceGroupName"
-          },
-          {
-            "$ref": "#/parameters/customAssessmentAutomationName"
-          }
-        ],
-        "x-ms-examples": {
-          "Delete a Custom Assessment Automation": {
-            "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json"
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK - Custom Assessment Automation was deleted"
-          },
-          "204": {
-            "description": "No Content - Custom Assessment Automation does not exist"
-          },
-          "default": {
-            "description": "Error response describing why the operation failed.",
-            "schema": {
-              "$ref": "./common/v1/types.json#/definitions/CloudError"
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customAssessmentAutomations": {
-      "get": {
-        "summary": "List custom assessment automations in a subscription and a resource group",
-        "description": "List custom assessment automations by provided subscription and resource group",
-        "tags": [
-          "customAssessmentAutomations"
-        ],
-        "operationId": "CustomAssessmentAutomations_ListByResourceGroup",
-        "parameters": [
-          {
-            "$ref": "./common/v1/types.json#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/SubscriptionId"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/ResourceGroupName"
-          }
-        ],
-        "x-ms-examples": {
-          "List Custom Assessment Automations in a subscription and a resource group": {
-            "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json"
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK - Returns a collection of Custom Assessment Automations",
-            "schema": {
-              "$ref": "#/definitions/customAssessmentAutomationsListResult"
-            }
-          },
-          "default": {
-            "description": "Error response that describes why the operation failed.",
-            "schema": {
-              "$ref": "./common/v1/types.json#/definitions/CloudError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}/providers/Microsoft.Security/customAssessmentAutomations": {
-      "get": {
-        "summary": "List custom assessment automations in a subscription",
-        "description": "List custom assessment automations by provided subscription",
-        "tags": [
-          "customAssessmentAutomations"
-        ],
-        "operationId": "CustomAssessmentAutomations_ListBySubscription",
-        "parameters": [
-          {
-            "$ref": "./common/v1/types.json#/parameters/ApiVersion"
-          },
-          {
-            "$ref": "./common/v1/types.json#/parameters/SubscriptionId"
-          }
-        ],
-        "x-ms-examples": {
-          "List Custom Assessment Automations in a subscription": {
-            "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json"
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK - Returns a collection of Custom Assessment Automations",
-            "schema": {
-              "$ref": "#/definitions/customAssessmentAutomationsListResult"
-            }
-          },
-          "default": {
-            "description": "Error response that describes why the operation failed.",
-            "schema": {
-              "$ref": "./common/v1/types.json#/definitions/CloudError"
-            }
-          }
-        },
-        "x-ms-pageable": {
-          "nextLinkName": "nextLink"
-        }
-      }
-    }
-  },
-  "definitions": {
-    "customAssessmentAutomationsListResult": {
-      "type": "object",
-      "description": "A list of Custom Assessment Automations",
-      "properties": {
-        "value": {
-          "description": "Collection of Custom Assessment Automations",
-          "readOnly": true,
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/customAssessmentAutomation"
-          }
-        },
-        "nextLink": {
-          "description": "The link used to get the next page of operations.",
-          "type": "string"
-        }
-      }
-    },
-    "customAssessmentAutomation": {
-      "type": "object",
-      "description": "Custom Assessment Automation",
-      "properties": {
-        "systemData": {
-          "readOnly": true,
-          "type": "object",
-          "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.",
-          "$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
-        },
-        "properties": {
-          "x-ms-client-flatten": true,
-          "description": "describes Custom Assessment Automation properties.",
-          "$ref": "#/definitions/customAssessmentAutomationProperties"
-        }
-      },
-      "allOf": [
-        {
-          "$ref": "./common/v1/types.json#/definitions/Resource"
-        }
-      ]
-    },
-    "customAssessmentAutomationRequest": {
-      "type": "object",
-      "description": "Custom Assessment Automation request",
-      "properties": {
-        "properties": {
-          "x-ms-client-flatten": true,
-          "description": "describes Custom Assessment Automation request properties.",
-          "$ref": "#/definitions/customAssessmentAutomationRequestProperties"
-        }
-      },
-      "allOf": [
-        {
-          "$ref": "./common/v1/types.json#/definitions/Resource"
-        }
-      ]
-    },
-    "customAssessmentAutomationProperties": {
-      "type": "object",
-      "description": "describes the Custom Assessment Automation properties",
-      "properties": {
-        "compressedQuery": {
-          "description": "GZip encoded KQL query representing the assessment automation results required.",
-          "type": "string"
-        },
-        "supportedCloud": {
-          "description": "Relevant cloud for the custom assessment automation.",
-          "type": "string",
-          "enum": [
-            "AWS",
-            "GCP"
-          ],
-          "x-ms-enum": {
-            "name": "supportedCloudEnum",
-            "modelAsString": true
-          },
-          "x-ms-client-default": "AWS"
-        },
-        "severity": {
-          "description": "The severity to relate to the assessments generated by this assessment automation.",
-          "type": "string",
-          "enum": [
-            "High",
-            "Medium",
-            "Low"
-          ],
-          "x-ms-enum": {
-            "name": "severityEnum",
-            "modelAsString": true
-          },
-          "x-ms-client-default": "Low"
-        },
-        "displayName": {
-          "description": "The display name of the assessments generated by this assessment automation.",
-          "type": "string"
-        },
-        "description": {
-          "description": "The description to relate to the assessments generated by this assessment automation.",
-          "type": "string"
-        },
-        "remediationDescription": {
-          "description": "The remediation description to relate to the assessments generated by this assessment automation.",
-          "type": "string"
-        },
-        "assessmentKey": {
-          "description": "The assessment metadata key used when an assessment is generated for this assessment automation.",
-          "type": "string"
-        }
-      }
-    },
-    "customAssessmentAutomationRequestProperties": {
-      "type": "object",
-      "description": "describes the Custom Assessment Automation properties",
-      "properties": {
-        "compressedQuery": {
-          "description": "Base 64 encoded KQL query representing the assessment automation results required.",
-          "type": "string"
-        },
-        "supportedCloud": {
-          "description": "Relevant cloud for the custom assessment automation.",
-          "type": "string",
-          "enum": [
-            "AWS",
-            "GCP"
-          ],
-          "x-ms-enum": {
-            "name": "supportedCloudEnum",
-            "modelAsString": true
-          },
-          "x-ms-client-default": "AWS"
-        },
-        "severity": {
-          "description": "The severity to relate to the assessments generated by this assessment automation.",
-          "type": "string",
-          "enum": [
-            "High",
-            "Medium",
-            "Low"
-          ],
-          "x-ms-enum": {
-            "name": "severityEnum",
-            "modelAsString": true
-          },
-          "x-ms-client-default": "Low"
-        },
-        "displayName": {
-          "description": "The display name of the assessments generated by this assessment automation.",
-          "type": "string"
-        },
-        "description": {
-          "description": "The description to relate to the assessments generated by this assessment automation.",
-          "type": "string"
-        },
-        "remediationDescription": {
-          "description": "The remediation description to relate to the assessments generated by this assessment automation.",
-          "type": "string"
-        }
-      }
-    }
-  },
-  "parameters": {
-    "customAssessmentAutomationName": {
-      "name": "customAssessmentAutomationName",
-      "in": "path",
-      "required": true,
-      "type": "string",
-      "description": "Name of the Custom Assessment Automation.",
-      "x-ms-parameter-location": "method"
-    },
-    "customAssessmentAutomationBody": {
-      "name": "customAssessmentAutomationBody",
-      "in": "body",
-      "description": "Custom Assessment Automation body",
-      "required": true,
-      "schema": {
-        "$ref": "#/definitions/customAssessmentAutomationRequest"
-      },
-      "x-ms-parameter-location": "method"
-    }
-  }
-}
diff --git a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json b/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json
deleted file mode 100644
index 322b0df8d380..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2021-07-01-preview",
-    "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b",
-    "resourceGroupName": "TestResourceGroup",
-    "customAssessmentAutomationName": "MyCustomAssessmentAutomation",
-    "customAssessmentAutomationBody": {
-      "properties": {
-        "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=",
-        "supportedCloud": "AWS",
-        "severity": "Medium",
-        "displayName": "Password Policy",
-        "description": "Data should be encrypted",
-        "remediationDescription": "Encrypt store by..."
-      }
-    }
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/33e7cc6e-a139-4723-a0e5-76993aee0771",
-        "name": "33e7cc6e-a139-4723-a0e5-76993aee0771",
-        "type": "Microsoft.Security/customAssessmentAutomations",
-        "systemData": {
-          "createdBy": "user@contoso.com",
-          "createdByType": "User",
-          "createdAt": "2021-08-31T13:47:50.328Z",
-          "lastModifiedBy": "user@contoso.com",
-          "lastModifiedByType": "User",
-          "lastModifiedAt": "2021-08-31T13:47:50.328Z"
-        },
-        "properties": {
-          "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=",
-          "supportedCloud": "AWS",
-          "severity": "Medium",
-          "displayName": "Password Policy",
-          "description": "organization passwords policy",
-          "remediationDescription": "Change password policy to...",
-          "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb"
-        }
-      }
-    },
-    "201": {
-      "body": {
-        "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/33e7cc6e-a139-4723-a0e5-76993aee0771",
-        "name": "33e7cc6e-a139-4723-a0e5-76993aee0771",
-        "type": "Microsoft.Security/customAssessmentAutomations",
-        "systemData": {
-          "createdBy": "user@contoso.com",
-          "createdByType": "User",
-          "createdAt": "2021-08-31T13:01:50.328Z",
-          "lastModifiedBy": "user@contoso.com",
-          "lastModifiedByType": "User",
-          "lastModifiedAt": "2021-08-31T13:01:50.328Z"
-        },
-        "properties": {
-          "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA",
-          "supportedCloud": "AWS",
-          "severity": "Medium",
-          "displayName": "Customized Encryption Rules",
-          "description": "Data should be encrypted",
-          "remediationDescription": "Encrypt store by...",
-          "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56"
-        }
-      }
-    }
-  }
-}
diff --git a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json b/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json
deleted file mode 100644
index b6939c3fe989..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2021-07-01-preview",
-    "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b",
-    "resourceGroupName": "TestResourceGroup",
-    "customAssessmentAutomationName": "MyCustomAssessmentAutomation"
-  },
-  "responses": {
-    "200": {},
-    "204": {}
-  }
-}
diff --git a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json b/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json
deleted file mode 100644
index 189b4c7b96ae..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2021-07-01-preview",
-    "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b",
-    "resourceGroupName": "TestResourceGroup",
-    "customAssessmentAutomationName": "MyCustomAssessmentAutomation"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation",
-        "name": "MyCustomAssessmentAutomation",
-        "type": "Microsoft.Security/customAssessmentAutomations",
-        "systemData": {
-          "createdBy": "user@contoso.com",
-          "createdByType": "User",
-          "createdAt": "2021-08-31T13:47:50.328Z",
-          "lastModifiedBy": "user@contoso.com",
-          "lastModifiedByType": "User",
-          "lastModifiedAt": "2021-08-31T13:47:50.328Z"
-        },
-        "properties": {
-          "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=",
-          "supportedCloud": "AWS",
-          "severity": "Low",
-          "displayName": "Password Policy",
-          "description": "organization passwords policy",
-          "remediationDescription": "Change password policy to...",
-          "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb"
-        }
-      }
-    }
-  }
-}
diff --git a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json
deleted file mode 100644
index 89aed1afb5df..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2021-07-01-preview",
-    "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b",
-    "resourceGroupName": "TestResourceGroup"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation1",
-            "name": "MyCustomAssessmentAutomation1",
-            "type": "Microsoft.Security/customAssessmentAutomations",
-            "systemData": {
-              "createdBy": "user@contoso.com",
-              "createdByType": "User",
-              "createdAt": "2021-08-31T13:47:50.328Z",
-              "lastModifiedBy": "user@contoso.com",
-              "lastModifiedByType": "User",
-              "lastModifiedAt": "2021-08-31T13:47:50.328Z"
-            },
-            "properties": {
-              "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=",
-              "supportedCloud": "AWS",
-              "severity": "Medium",
-              "displayName": "Password Policy",
-              "description": "organization passwords policy",
-              "remediationDescription": "Change password policy to...",
-              "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb"
-            }
-          },
-          {
-            "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation2",
-            "name": "MyCustomAssessmentAutomation2",
-            "type": "Microsoft.Security/customAssessmentAutomations",
-            "systemData": {
-              "createdBy": "user@contoso.com",
-              "createdByType": "User",
-              "createdAt": "2021-08-31T13:01:50.328Z",
-              "lastModifiedBy": "user@contoso.com",
-              "lastModifiedByType": "User",
-              "lastModifiedAt": "2021-08-31T13:01:50.328Z"
-            },
-            "properties": {
-              "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA",
-              "supportedCloud": "AWS",
-              "severity": "Low",
-              "displayName": "Password Policy",
-              "description": "organization passwords policy",
-              "remediationDescription": "Change password policy to...",
-              "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56"
-            }
-          }
-        ],
-        "nextLink": "link"
-      }
-    }
-  }
-}
diff --git a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json
deleted file mode 100644
index d23a835bfa45..000000000000
--- a/specification/security/resource-manager/Microsoft.Security/Security/preview/2021-07-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "parameters": {
-    "api-version": "2021-07-01-preview",
-    "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b"
-  },
-  "responses": {
-    "200": {
-      "body": {
-        "value": [
-          {
-            "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation1",
-            "name": "MyCustomAssessmentAutomation1",
-            "type": "Microsoft.Security/customAssessmentAutomations",
-            "systemData": {
-              "createdBy": "user@contoso.com",
-              "createdByType": "User",
-              "createdAt": "2021-08-31T13:47:50.328Z",
-              "lastModifiedBy": "user@contoso.com",
-              "lastModifiedByType": "User",
-              "lastModifiedAt": "2021-08-31T13:47:50.328Z"
-            },
-            "properties": {
-              "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=",
-              "supportedCloud": "AWS",
-              "severity": "Medium",
-              "displayName": "Password Policy",
-              "description": "organization passwords policy",
-              "remediationDescription": "Change password policy to...",
-              "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb"
-            }
-          },
-          {
-            "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation2",
-            "name": "MyCustomAssessmentAutomation2",
-            "type": "Microsoft.Security/customAssessmentAutomations",
-            "systemData": {
-              "createdBy": "user@contoso.com",
-              "createdByType": "User",
-              "createdAt": "2021-08-31T13:01:50.328Z",
-              "lastModifiedBy": "user@contoso.com",
-              "lastModifiedByType": "User",
-              "lastModifiedAt": "2021-08-31T13:01:50.328Z"
-            },
-            "properties": {
-              "compressedQuery": "Q29tcHV0ZV9OZXR3b3JrCnwgZXh0ZW5kIEhlYWx0aFN0YXR1cyA9ICdVTkhFQUxUSFkn",
-              "supportedCloud": "GCP",
-              "severity": "Low",
-              "displayName": "Password Policy",
-              "description": "organization passwords policy",
-              "remediationDescription": "Change password policy to...",
-              "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56"
-            }
-          }
-        ],
-        "nextLink": "link"
-      }
-    }
-  }
-}
diff --git a/specification/security/resource-manager/Microsoft.Security/Security/readme.md b/specification/security/resource-manager/Microsoft.Security/Security/readme.md
index 0e3111c8c6d9..a58152b33f4d 100644
--- a/specification/security/resource-manager/Microsoft.Security/Security/readme.md
+++ b/specification/security/resource-manager/Microsoft.Security/Security/readme.md
@@ -575,7 +575,6 @@ input-file:
 - preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json
 - preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanResultsOperations.json
 - preview/2021-05-01-preview/softwareInventories.json
-- preview/2021-07-01-preview/customAssessmentAutomation.json
 - preview/2021-10-01-preview/mdeOnboardings.json
 - preview/2022-08-01-preview/securityConnectors.json
 
@@ -617,7 +616,6 @@ input-file:
 - preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json
 - preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanResultsOperations.json
 - preview/2021-05-01-preview/softwareInventories.json
-- preview/2021-07-01-preview/customAssessmentAutomation.json
 - preview/2021-10-01-preview/mdeOnboardings.json
 - preview/2022-08-01-preview/securityConnectors.json
 - stable/2018-06-01/pricings.json
@@ -644,7 +642,6 @@ input-file:
 - preview/2019-01-01-preview/regulatoryCompliance.json
 - preview/2019-01-01-preview/subAssessments.json
 - preview/2021-05-01-preview/softwareInventories.json
-- preview/2021-07-01-preview/customAssessmentAutomation.json
 - preview/2021-10-01-preview/mdeOnboardings.json
 - preview/2022-01-01-preview/governanceAssignments.json
 - preview/2022-01-01-preview/governanceRules.json
@@ -727,7 +724,6 @@ input-file:
 - preview/2019-01-01-preview/subAssessments.json
 - preview/2020-01-01-preview/securityContacts.json
 - preview/2021-05-01-preview/softwareInventories.json
-- preview/2021-07-01-preview/customAssessmentAutomation.json
 - preview/2021-10-01-preview/mdeOnboardings.json
 - preview/2022-01-01-preview/governanceAssignments.json
 - preview/2022-01-01-preview/governanceRules.json
@@ -1085,7 +1081,6 @@ These settings apply only when `--tag=package-2021-07-preview-only` is specified
 
 ``` yaml $(tag) == 'package-2021-07-preview-only'
 input-file:
-  - preview/2021-07-01-preview/customAssessmentAutomation.json
   - preview/2021-07-01-preview/securityConnectors.json
 override-info:
   title: SecurityCenter