diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
index 953960cdeb..108b8d2e0c 100644
--- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json
+++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -701,9 +701,6 @@
             {
               "$ref": "https://schema.management.azure.com/schemas/2021-06-01/Microsoft.Authorization.Resources.json#/unknown_resourceDefinitions/policyAssignments"
             },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/subscription_resourceDefinitions/billingAccounts_lineOfCredit"
-            },
             {
               "$ref": "https://schema.management.azure.com/schemas/2017-11-11-preview/Microsoft.Blueprint.json#/subscription_resourceDefinitions/blueprintAssignments"
             },
diff --git a/schemas/2018-11-01-preview/Microsoft.Billing.json b/schemas/2018-11-01-preview/Microsoft.Billing.json
deleted file mode 100644
index 881033b50a..0000000000
--- a/schemas/2018-11-01-preview/Microsoft.Billing.json
+++ /dev/null
@@ -1,489 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Billing",
-  "description": "Microsoft Billing Resource Types",
-  "resourceDefinitions": {},
-  "subscription_resourceDefinitions": {
-    "billingAccounts_lineOfCredit": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2018-11-01-preview"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/LineOfCreditProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the line of credit."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/lineOfCredit"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/lineOfCredit"
-    }
-  },
-  "tenant_resourceDefinitions": {
-    "billingAccounts_billingProfiles": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2018-11-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Billing Profile Id."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingProfileProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the billing profile."
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_policies_childResource"
-              }
-            ]
-          }
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles"
-    },
-    "billingAccounts_billingProfiles_policies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2018-11-01-preview"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-    },
-    "billingAccounts_invoiceSections": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2018-11-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "InvoiceSection Id."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InvoiceSectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of an InvoiceSection."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/invoiceSections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/invoiceSections"
-    }
-  },
-  "definitions": {
-    "Address": {
-      "type": "object",
-      "properties": {
-        "addressLine1": {
-          "type": "string",
-          "description": "Address Line1."
-        },
-        "addressLine2": {
-          "type": "string",
-          "description": "Address Line1."
-        },
-        "addressLine3": {
-          "type": "string",
-          "description": "Address Line1."
-        },
-        "city": {
-          "type": "string",
-          "description": "Address City."
-        },
-        "companyName": {
-          "type": "string",
-          "description": "Company Name."
-        },
-        "country": {
-          "type": "string",
-          "description": "Country code uses ISO2, 2-digit format."
-        },
-        "firstName": {
-          "type": "string",
-          "description": "First Name."
-        },
-        "lastName": {
-          "type": "string",
-          "description": "Last Name."
-        },
-        "postalCode": {
-          "type": "string",
-          "description": "Address Postal Code."
-        },
-        "region": {
-          "type": "string",
-          "description": "Address Region."
-        }
-      },
-      "description": "Address details."
-    },
-    "Amount": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "oneOf": [
-            {
-              "type": "number"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Amount value."
-        }
-      },
-      "description": "The Amount."
-    },
-    "billingAccounts_billingProfiles_policies_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2018-11-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "enum": [
-            "default"
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-    },
-    "BillingProfile": {
-      "type": "object",
-      "properties": {
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingProfileProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the billing profile."
-        }
-      },
-      "description": "A billing profile resource."
-    },
-    "BillingProfileProperties": {
-      "type": "object",
-      "properties": {
-        "address": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Address"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Address details."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The billing profile name."
-        },
-        "enabledAzureSKUs": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/EnabledAzureSKUs"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Information about the product."
-        },
-        "invoiceSections": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/InvoiceSection"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The invoice sections associated to the billing profile."
-        },
-        "poNumber": {
-          "type": "string",
-          "description": "Purchase order number."
-        }
-      },
-      "description": "The properties of the billing profile."
-    },
-    "EnabledAzureSKUs": {
-      "type": "object",
-      "properties": {
-        "skuId": {
-          "type": "string",
-          "description": "The sku id."
-        }
-      },
-      "description": "Details about the enabled azure sku."
-    },
-    "InvoiceSection": {
-      "type": "object",
-      "properties": {
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InvoiceSectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of an InvoiceSection."
-        }
-      },
-      "description": "An InvoiceSection resource."
-    },
-    "InvoiceSectionProperties": {
-      "type": "object",
-      "properties": {
-        "billingProfiles": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/BillingProfile"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The billing profiles associated to the billing account."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The name of the InvoiceSection."
-        }
-      },
-      "description": "The properties of an InvoiceSection."
-    },
-    "LineOfCreditProperties": {
-      "type": "object",
-      "properties": {
-        "creditLimit": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Amount"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The Amount."
-        },
-        "status": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Approved",
-                "Rejected"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The line of credit status."
-        }
-      },
-      "description": "The properties of the line of credit."
-    },
-    "PolicyProperties": {
-      "type": "object",
-      "properties": {
-        "marketplacePurchasesAllowed": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The marketplacePurchasesAllowed flag."
-        },
-        "reservationPurchasesAllowed": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The reservationPurchasesAllowed flag."
-        },
-        "subscriptionOwnerCanViewCharges": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The subscriptionOwnerCanViewCharges flag."
-        }
-      },
-      "description": "The properties of policy."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
index a2a2b3b5d4..8c90b16328 100644
--- a/schemas/2019-08-01/tenantDeploymentTemplate.json
+++ b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -556,63 +556,6 @@
                 {
                   "$ref": "https://schema.management.azure.com/schemas/2017-09-01/Microsoft.Authorization.json#/resourceDefinitions/roleDefinitions"
                 },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_policies"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2018-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_invoiceSections"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_instructions"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_invoiceSections"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_policies"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingRoleAssignments"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_customers_policies"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_departments_billingRoleAssignments"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_enrollmentAccounts_billingRoleAssignments"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-05-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-05-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_instructions"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-05-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_invoiceSections"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-05-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_policies"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-05-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_customers_policies"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/promotions"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2020-11-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/promotions"
-                },
-                {
-                  "$ref": "https://schema.management.azure.com/schemas/2021-10-01/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingSubscriptionAliases"
-                },
                 {
                   "$ref": "https://schema.management.azure.com/schemas/2019-04-01/Microsoft.Capacity.json#/tenant_resourceDefinitions/reservationOrders"
                 },
diff --git a/schemas/2019-10-01-preview/Microsoft.Billing.json b/schemas/2019-10-01-preview/Microsoft.Billing.json
deleted file mode 100644
index fe6a040dcb..0000000000
--- a/schemas/2019-10-01-preview/Microsoft.Billing.json
+++ /dev/null
@@ -1,680 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Billing",
-  "description": "Microsoft Billing Resource Types",
-  "resourceDefinitions": {},
-  "tenant_resourceDefinitions": {
-    "billingAccounts_billingProfiles": {
-      "type": "object",
-      "properties": {
-        "address": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/AddressDetails"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Address details."
-        },
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The name of the billing profile."
-        },
-        "enabledAzurePlans": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/AzurePlan"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Enabled azure plans for the billing profile."
-        },
-        "invoiceEmailOptIn": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Flag controlling whether the invoices for the billing profile are sent through email."
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies a billing profile."
-        },
-        "poNumber": {
-          "type": "string",
-          "description": "The purchase order name that will appear on the invoices generated for the billing profile."
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_instructions_childResource"
-              },
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_invoiceSections_childResource"
-              },
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_policies_childResource"
-              }
-            ]
-          }
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles"
-    },
-    "billingAccounts_billingProfiles_instructions": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Instruction Name."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InstructionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A billing instruction used during invoice generation."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/instructions"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/instructions"
-    },
-    "billingAccounts_billingProfiles_invoiceSections": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The name of the invoice section."
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies an invoice section."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections"
-    },
-    "billingAccounts_billingProfiles_policies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-    },
-    "billingAccounts_billingRoleAssignments": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies a role assignment."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingRoleAssignmentProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the role assignment."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingRoleAssignments"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingRoleAssignments"
-    },
-    "billingAccounts_customers_policies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/CustomerPolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a customer's policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/customers/policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/customers/policies"
-    },
-    "billingAccounts_departments_billingRoleAssignments": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies a role assignment."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingRoleAssignmentProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the role assignment."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/departments/billingRoleAssignments"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/departments/billingRoleAssignments"
-    },
-    "billingAccounts_enrollmentAccounts_billingRoleAssignments": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies a role assignment."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingRoleAssignmentProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the role assignment."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/enrollmentAccounts/billingRoleAssignments"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/enrollmentAccounts/billingRoleAssignments"
-    }
-  },
-  "definitions": {
-    "AddressDetails": {
-      "type": "object",
-      "properties": {
-        "addressLine1": {
-          "type": "string",
-          "description": "Address line 1."
-        },
-        "addressLine2": {
-          "type": "string",
-          "description": "Address line 1."
-        },
-        "addressLine3": {
-          "type": "string",
-          "description": "Address line 1."
-        },
-        "city": {
-          "type": "string",
-          "description": "Address city."
-        },
-        "companyName": {
-          "type": "string",
-          "description": "Company name."
-        },
-        "country": {
-          "type": "string",
-          "description": "Country code uses ISO2, 2-digit format."
-        },
-        "firstName": {
-          "type": "string",
-          "description": "First name."
-        },
-        "lastName": {
-          "type": "string",
-          "description": "Last name."
-        },
-        "postalCode": {
-          "type": "string",
-          "description": "Postal code."
-        },
-        "region": {
-          "type": "string",
-          "description": "Address region."
-        }
-      },
-      "description": "Address details."
-    },
-    "AzurePlan": {
-      "type": "object",
-      "properties": {
-        "skuId": {
-          "type": "string",
-          "description": "The sku id."
-        }
-      },
-      "description": "Details of the Azure plan."
-    },
-    "billingAccounts_billingProfiles_instructions_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Instruction Name."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InstructionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A billing instruction used during invoice generation."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "instructions"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/instructions"
-    },
-    "billingAccounts_billingProfiles_invoiceSections_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The name of the invoice section."
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies an invoice section."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "invoiceSections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections"
-    },
-    "billingAccounts_billingProfiles_policies_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2019-10-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "enum": [
-            "default"
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-    },
-    "BillingRoleAssignmentProperties": {
-      "type": "object",
-      "properties": {
-        "principalId": {
-          "type": "string",
-          "description": "The principal id of the user to whom the role was assigned."
-        },
-        "principalTenantId": {
-          "type": "string",
-          "description": "The principal tenant id of the user to whom the role was assigned."
-        },
-        "roleDefinitionId": {
-          "type": "string",
-          "description": "The ID of the role definition."
-        },
-        "userAuthenticationType": {
-          "type": "string",
-          "description": "The authentication type of the user, whether Organization or MSA, of the user to whom the role was assigned. This is supported only for billing accounts with agreement type Enterprise Agreement."
-        },
-        "userEmailAddress": {
-          "type": "string",
-          "description": "The email address of the user to whom the role was assigned. This is supported only for billing accounts with agreement type Enterprise Agreement."
-        }
-      },
-      "description": "The properties of the role assignment."
-    },
-    "CustomerPolicyProperties": {
-      "type": "object",
-      "properties": {
-        "viewCharges": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Allowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether the users in customer's organization can view charges at pay-as-you-go prices."
-        }
-      },
-      "description": "The properties of a customer's policy."
-    },
-    "InstructionProperties": {
-      "type": "object",
-      "properties": {
-        "amount": {
-          "oneOf": [
-            {
-              "type": "number"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The amount budgeted for this billing instruction."
-        },
-        "creationDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The date this billing instruction was created."
-        },
-        "endDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The date this billing instruction is no longer in effect."
-        },
-        "startDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The date this billing instruction goes into effect."
-        }
-      },
-      "required": [
-        "amount",
-        "endDate",
-        "startDate"
-      ],
-      "description": "A billing instruction used during invoice generation."
-    },
-    "PolicyProperties": {
-      "type": "object",
-      "properties": {
-        "marketplacePurchases": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AllAllowed",
-                "OnlyFreeAllowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether Azure marketplace purchases are allowed for a billing profile."
-        },
-        "reservationPurchases": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Allowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether Azure reservation purchases are allowed for a billing profile."
-        },
-        "viewCharges": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Allowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether users with Azure RBAC access to a subscription can view its charges."
-        }
-      },
-      "description": "The properties of a policy."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-05-01/Microsoft.Billing.json b/schemas/2020-05-01/Microsoft.Billing.json
deleted file mode 100644
index d72980e824..0000000000
--- a/schemas/2020-05-01/Microsoft.Billing.json
+++ /dev/null
@@ -1,694 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-05-01/Microsoft.Billing.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Billing",
-  "description": "Microsoft Billing Resource Types",
-  "resourceDefinitions": {},
-  "tenant_resourceDefinitions": {
-    "billingAccounts_billingProfiles": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies a billing profile."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingProfileProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of the billing profile."
-        },
-        "resources": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_instructions_childResource"
-              },
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_invoiceSections_childResource"
-              },
-              {
-                "$ref": "#/definitions/billingAccounts_billingProfiles_policies_childResource"
-              }
-            ]
-          }
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles"
-    },
-    "billingAccounts_billingProfiles_instructions": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Instruction Name."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InstructionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A billing instruction used during invoice generation."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/instructions"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/instructions"
-    },
-    "billingAccounts_billingProfiles_invoiceSections": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies an invoice section."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InvoiceSectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of an invoice section."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections"
-    },
-    "billingAccounts_billingProfiles_policies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-    },
-    "billingAccounts_customers_policies": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "oneOf": [
-            {
-              "type": "string",
-              "pattern": "^.*/default$"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/CustomerPolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a customer's policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/customers/policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/customers/policies"
-    }
-  },
-  "definitions": {
-    "AddressDetails": {
-      "type": "object",
-      "properties": {
-        "addressLine1": {
-          "type": "string",
-          "description": "Address line 1."
-        },
-        "addressLine2": {
-          "type": "string",
-          "description": "Address line 1."
-        },
-        "addressLine3": {
-          "type": "string",
-          "description": "Address line 1."
-        },
-        "city": {
-          "type": "string",
-          "description": "Address city."
-        },
-        "companyName": {
-          "type": "string",
-          "description": "Company name."
-        },
-        "country": {
-          "type": "string",
-          "description": "Country code uses ISO2, 2-digit format."
-        },
-        "district": {
-          "type": "string",
-          "description": "Address district."
-        },
-        "email": {
-          "type": "string",
-          "description": "Email address."
-        },
-        "firstName": {
-          "type": "string",
-          "description": "First name."
-        },
-        "lastName": {
-          "type": "string",
-          "description": "Last name."
-        },
-        "middleName": {
-          "type": "string",
-          "description": "Middle name."
-        },
-        "phoneNumber": {
-          "type": "string",
-          "description": "Phone number."
-        },
-        "postalCode": {
-          "type": "string",
-          "description": "Postal code."
-        },
-        "region": {
-          "type": "string",
-          "description": "Address region."
-        }
-      },
-      "required": [
-        "addressLine1",
-        "country"
-      ],
-      "description": "Address details."
-    },
-    "AzurePlan": {
-      "type": "object",
-      "properties": {
-        "skuId": {
-          "type": "string",
-          "description": "The sku id."
-        }
-      },
-      "description": "Details of the Azure plan."
-    },
-    "billingAccounts_billingProfiles_instructions_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Instruction Name."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InstructionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A billing instruction used during invoice generation."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "instructions"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/instructions"
-    },
-    "billingAccounts_billingProfiles_invoiceSections_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies an invoice section."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InvoiceSectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of an invoice section."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "invoiceSections"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/invoiceSections"
-    },
-    "billingAccounts_billingProfiles_policies_childResource": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-05-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "enum": [
-            "default"
-          ]
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PolicyProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of a policy."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "policies"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies"
-    },
-    "BillingProfileProperties": {
-      "type": "object",
-      "properties": {
-        "billTo": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/AddressDetails"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Address details."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The name of the billing profile."
-        },
-        "enabledAzurePlans": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/AzurePlan"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Information about the enabled azure plans."
-        },
-        "invoiceEmailOptIn": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Flag controlling whether the invoices for the billing profile are sent through email."
-        },
-        "invoiceSections": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InvoiceSectionsOnExpand"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The invoice sections associated to the billing profile. By default this is not populated, unless it's specified in $expand."
-        },
-        "poNumber": {
-          "type": "string",
-          "description": "The purchase order name that will appear on the invoices generated for the billing profile."
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Tags of billing profiles."
-        }
-      },
-      "description": "The properties of the billing profile."
-    },
-    "CustomerPolicyProperties": {
-      "type": "object",
-      "properties": {
-        "viewCharges": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Allowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether the users in customer's organization can view charges at pay-as-you-go prices."
-        }
-      },
-      "description": "The properties of a customer's policy."
-    },
-    "InstructionProperties": {
-      "type": "object",
-      "properties": {
-        "amount": {
-          "oneOf": [
-            {
-              "type": "number"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The amount budgeted for this billing instruction."
-        },
-        "creationDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The date this billing instruction was created."
-        },
-        "endDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The date this billing instruction is no longer in effect."
-        },
-        "startDate": {
-          "type": "string",
-          "format": "date-time",
-          "description": "The date this billing instruction goes into effect."
-        }
-      },
-      "required": [
-        "amount",
-        "endDate",
-        "startDate"
-      ],
-      "description": "A billing instruction used during invoice generation."
-    },
-    "InvoiceSection": {
-      "type": "object",
-      "properties": {
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/InvoiceSectionProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The properties of an invoice section."
-        }
-      },
-      "description": "An invoice section."
-    },
-    "InvoiceSectionProperties": {
-      "type": "object",
-      "properties": {
-        "displayName": {
-          "type": "string",
-          "description": "The name of the invoice section."
-        },
-        "labels": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Dictionary of metadata associated with the invoice section."
-        },
-        "tags": {
-          "oneOf": [
-            {
-              "type": "object",
-              "additionalProperties": {
-                "type": "string"
-              },
-              "properties": {}
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Dictionary of metadata associated with the invoice section. Maximum key/value length supported of 256 characters. Keys/value should not empty value nor null. Keys can not contain < > % & \\ ? /"
-        }
-      },
-      "description": "The properties of an invoice section."
-    },
-    "InvoiceSectionsOnExpand": {
-      "type": "object",
-      "properties": {
-        "value": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/InvoiceSection"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The invoice sections associated to the billing profile."
-        }
-      },
-      "description": "The invoice sections associated to the billing profile. By default this is not populated, unless it's specified in $expand."
-    },
-    "PolicyProperties": {
-      "type": "object",
-      "properties": {
-        "marketplacePurchases": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AllAllowed",
-                "OnlyFreeAllowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether Azure marketplace purchases are allowed for a billing profile."
-        },
-        "reservationPurchases": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Allowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether Azure reservation purchases are allowed for a billing profile."
-        },
-        "viewCharges": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Allowed",
-                "NotAllowed"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The policy that controls whether users with Azure RBAC access to a subscription can view its charges."
-        }
-      },
-      "description": "The properties of a policy."
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-09-01-preview/Microsoft.Billing.json b/schemas/2020-09-01-preview/Microsoft.Billing.json
deleted file mode 100644
index daebc2e177..0000000000
--- a/schemas/2020-09-01-preview/Microsoft.Billing.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.Billing.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Billing",
-  "description": "Microsoft Billing Resource Types",
-  "resourceDefinitions": {},
-  "tenant_resourceDefinitions": {
-    "promotions": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-09-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Promotion Id"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PromotionCreateRequestProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PromotionCreateSkuNameRequestProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/promotions"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/promotions"
-    }
-  },
-  "definitions": {
-    "PromotionCreateRequestProperties": {
-      "type": "object",
-      "properties": {
-        "appliedScopes": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "List of the subscriptions that the benefit will be applied."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "Friendly name for user to easily identified the promotion."
-        },
-        "orderId": {
-          "type": "string",
-          "description": "Unique Id for the promotion order."
-        }
-      }
-    },
-    "PromotionCreateSkuNameRequestProperties": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "SKU Name of the promotion to activate"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2020-11-01-preview/Microsoft.Billing.json b/schemas/2020-11-01-preview/Microsoft.Billing.json
deleted file mode 100644
index 0d58bcd8af..0000000000
--- a/schemas/2020-11-01-preview/Microsoft.Billing.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2020-11-01-preview/Microsoft.Billing.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Billing",
-  "description": "Microsoft Billing Resource Types",
-  "resourceDefinitions": {},
-  "tenant_resourceDefinitions": {
-    "promotions": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-11-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Promotion Id"
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PromotionCreateRequestProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "sku": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/PromotionCreateSkuNameRequestProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/promotions"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/promotions"
-    }
-  },
-  "definitions": {
-    "PromotionCreateRequestProperties": {
-      "type": "object",
-      "properties": {
-        "appliedScopes": {
-          "oneOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "List of the subscriptions that the benefit will be applied."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "Friendly name for user to easily identified the promotion."
-        },
-        "orderId": {
-          "type": "string",
-          "description": "Unique Id for the promotion order."
-        }
-      }
-    },
-    "PromotionCreateSkuNameRequestProperties": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "SKU Name of the promotion to activate"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/schemas/2021-10-01/Microsoft.Billing.json b/schemas/2021-10-01/Microsoft.Billing.json
deleted file mode 100644
index 3814364b4c..0000000000
--- a/schemas/2021-10-01/Microsoft.Billing.json
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-  "id": "https://schema.management.azure.com/schemas/2021-10-01/Microsoft.Billing.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.Billing",
-  "description": "Microsoft Billing Resource Types",
-  "resourceDefinitions": {},
-  "tenant_resourceDefinitions": {
-    "billingAccounts_billingSubscriptionAliases": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2021-10-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The ID that uniquely identifies a subscription alias."
-        },
-        "properties": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/BillingSubscriptionAliasProperties"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Billing subscription alias properties."
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Billing/billingAccounts/billingSubscriptionAliases"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "properties",
-        "type"
-      ],
-      "description": "Microsoft.Billing/billingAccounts/billingSubscriptionAliases"
-    }
-  },
-  "definitions": {
-    "Amount": {
-      "type": "object",
-      "properties": {},
-      "description": "The amount."
-    },
-    "BillingSubscriptionAliasProperties": {
-      "type": "object",
-      "properties": {
-        "autoRenew": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Off",
-                "On"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Indicates whether auto renewal is turned on or off for a subscription."
-        },
-        "beneficiaryTenantId": {
-          "type": "string",
-          "description": "The provisioning tenant of the subscription."
-        },
-        "billingFrequency": {
-          "type": "string",
-          "description": "The billing frequency of the subscription in the ISO8601 format. Example: P1M, P3M, P1Y"
-        },
-        "billingProfileId": {
-          "type": "string",
-          "description": "The ID of the billing profile to which the subscription is billed. This field is only applicable for Microsoft Customer Agreement billing accounts."
-        },
-        "consumptionCostCenter": {
-          "type": "string",
-          "description": "The cost center applied to the subscription. This field is only available for consumption subscriptions of Microsoft Customer Agreement Type billing accounts."
-        },
-        "customerId": {
-          "type": "string",
-          "description": "The ID of the customer for whom the subscription was created. The field is applicable only for Microsoft Partner Agreement billing accounts."
-        },
-        "displayName": {
-          "type": "string",
-          "description": "The name of the subscription."
-        },
-        "enrollmentAccountSubscriptionDetails": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/EnrollmentAccountSubscriptionDetails"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The billing properties that can be modified. This field is available only for the Enterprise Agreement billing accounts."
-        },
-        "invoiceSectionId": {
-          "type": "string",
-          "description": "The ID of the invoice section to which the subscription is billed. The field is applicable only for Microsoft Partner Agreement billing accounts."
-        },
-        "lastMonthCharges": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Amount"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The amount."
-        },
-        "monthToDateCharges": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Amount"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The amount."
-        },
-        "nextBillingCycleDetails": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/NextBillingCycleDetails"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The next billing cycle details of the subscription."
-        },
-        "productTypeId": {
-          "type": "string",
-          "description": "The ID of the product for which the subscription is purchased"
-        },
-        "quantity": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The number of licenses purchased for the subscription"
-        },
-        "renewalTermDetails": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/RenewalTermDetails"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The term details of the subscription at renewal."
-        },
-        "reseller": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Reseller"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Details of the reseller."
-        },
-        "skuId": {
-          "type": "string",
-          "description": "The SKU ID of the product for which the subscription is purchased. This field is only available for Microsoft Customer Agreement billing accounts."
-        },
-        "termDuration": {
-          "type": "string",
-          "description": "The duration for which you can use the subscription. Example P1Y and P1M"
-        }
-      },
-      "description": "Billing subscription alias properties."
-    },
-    "EnrollmentAccountSubscriptionDetails": {
-      "type": "object",
-      "properties": {},
-      "description": "The billing properties that can be modified. This field is available only for the Enterprise Agreement billing accounts."
-    },
-    "NextBillingCycleDetails": {
-      "type": "object",
-      "properties": {},
-      "description": "The next billing cycle details of the subscription."
-    },
-    "RenewalTermDetails": {
-      "type": "object",
-      "properties": {
-        "quantity": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The number of licenses"
-        }
-      },
-      "description": "The term details of the subscription at renewal."
-    },
-    "Reseller": {
-      "type": "object",
-      "properties": {},
-      "description": "Details of the reseller."
-    }
-  }
-}
\ No newline at end of file