diff --git a/schemas/2017-04-01/Microsoft.Aadiam.json b/schemas/2017-04-01/Microsoft.Aadiam.json
deleted file mode 100644
index 75ee94e154..0000000000
--- a/schemas/2017-04-01/Microsoft.Aadiam.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.Aadiam.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.aadiam",
-  "description": "microsoft aadiam Resource Types",
-  "resourceDefinitions": {},
-  "tenant_resourceDefinitions": {
-    "diagnosticSettings": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2017-04-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the diagnostic setting."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/DiagnosticSettings"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The diagnostic settings."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "microsoft.aadiam/diagnosticSettings"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "microsoft.aadiam/diagnosticSettings"
-    }
-  },
-  "definitions": {
-    "DiagnosticSettings": {
-      "type": "object",
-      "properties": {
-        "eventHubAuthorizationRuleId": {
-          "type": "string",
-          "description": "The resource Id for the event hub authorization rule."
-        },
-        "eventHubName": {
-          "type": "string",
-          "description": "The name of the event hub. If none is specified, the default event hub will be selected."
-        },
-        "logs": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/LogSettings"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The list of logs settings."
-        },
-        "serviceBusRuleId": {
-          "type": "string",
-          "description": "The service bus rule Id of the diagnostic setting. This is here to maintain backwards compatibility."
-        },
-        "storageAccountId": {
-          "type": "string",
-          "description": "The resource ID of the storage account to which you would like to send Diagnostic Logs."
-        },
-        "workspaceId": {
-          "type": "string",
-          "description": "The workspace ID (resource ID of a Log Analytics workspace) for a Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2"
-        }
-      },
-      "description": "The diagnostic settings."
-    },
-    "LogSettings": {
-      "type": "object",
-      "properties": {
-        "category": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AuditLogs",
-                "SignInLogs"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Name of a Diagnostic Log category for a resource type this setting is applied to. To obtain the list of Diagnostic Log categories for a resource, first perform a GET diagnostic settings operation."
-        },
-        "enabled": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A value indicating whether this log is enabled."
-        },
-        "retentionPolicy": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/RetentionPolicy"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Specifies the retention policy for the log."
-        }
-      },
-      "required": [
-        "enabled"
-      ],
-      "description": "Part of MultiTenantDiagnosticSettings. Specifies the settings for a particular log."
-    },
-    "RetentionPolicy": {
-      "type": "object",
-      "properties": {
-        "days": {
-          "oneOf": [
-            {
-              "type": "integer",
-              "minimum": 0
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The number of days for the retention in days. A value of 0 will retain the events indefinitely."
-        },
-        "enabled": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A value indicating whether the retention policy is enabled."
-        }
-      },
-      "required": [
-        "days",
-        "enabled"
-      ],
-      "description": "Specifies the retention policy for the log."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
index 7cb34f7628..0d32c03046 100644
--- a/schemas/2019-08-01/tenantDeploymentTemplate.json
+++ b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -59,9 +59,6 @@
               },
               {
                 "oneOf": [
-                  {
-                    "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.Aadiam.json#/tenant_resourceDefinitions/diagnosticSettings"
-                  },
                   {
                     "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleAssignments"
                   },
diff --git a/schemas/2020-03-01-preview/Microsoft.Aadiam.json b/schemas/2020-03-01-preview/Microsoft.Aadiam.json
deleted file mode 100644
index 7cd256194c..0000000000
--- a/schemas/2020-03-01-preview/Microsoft.Aadiam.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Aadiam.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.aadiam",
-  "description": "microsoft aadiam Resource Types",
-  "resourceDefinitions": {
-    "privateLinkForAzureAd": {
-      "type": "object",
-      "properties": {
-        "allTenants": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Flag indicating whether all tenants are allowed"
-        },
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-03-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the private link policy in Azure AD."
-        },
-        "ownerTenantId": {
-          "type": "string",
-          "description": "Guid of the owner tenant"
-        },
-        "resourceGroup": {
-          "type": "string",
-          "description": "Name of the resource group"
-        },
-        "resourceName": {
-          "type": "string",
-          "description": "Name of the private link policy resource"
-        },
-        "subscriptionId": {
-          "type": "string",
-          "description": "Subscription Identifier"
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Resource tags."
-        },
-        "tenants": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The list of tenantIds."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "microsoft.aadiam/privateLinkForAzureAd"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "microsoft.aadiam/privateLinkForAzureAd"
-    }
-  },
-  "definitions": {}
-}
\ No newline at end of file
diff --git a/schemas/2020-07-01-preview/Microsoft.Aadiam.json b/schemas/2020-07-01-preview/Microsoft.Aadiam.json
deleted file mode 100644
index f8532f3ada..0000000000
--- a/schemas/2020-07-01-preview/Microsoft.Aadiam.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Aadiam.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "microsoft.aadiam",
-  "description": "microsoft aadiam Resource Types",
-  "resourceDefinitions": {
-    "azureADMetrics": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-07-01-preview"
-          ]
-        },
-        "location": {
-          "type": "string",
-          "description": "The geo-location where the resource lives"
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the azureADMetrics instance."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/AzureADMetricsPropertiesFormat"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "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.aadiam/azureADMetrics"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "location",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "microsoft.aadiam/azureADMetrics"
-    }
-  },
-  "definitions": {
-    "AzureADMetricsPropertiesFormat": {
-      "type": "object",
-      "properties": {}
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 1cddc85208..64123938ca 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -25,12 +25,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-01-01/Microsoft.AAD.json#/resourceDefinitions/domainServices_ouContainer"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.Aadiam.json#/resourceDefinitions/privateLinkForAzureAd"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Aadiam.json#/resourceDefinitions/azureADMetrics"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2017-04-19/Microsoft.Advisor.json#/resourceDefinitions/configurations"
         },