diff --git a/schemas/2021-06-01-preview/Microsoft.DataBoxEdge.json b/schemas/2021-06-01-preview/Microsoft.DataBoxEdge.json
index ffcba6079b..85cab24da2 100644
--- a/schemas/2021-06-01-preview/Microsoft.DataBoxEdge.json
+++ b/schemas/2021-06-01-preview/Microsoft.DataBoxEdge.json
@@ -28,23 +28,6 @@
           ],
           "description": "Msi identity details of the resource"
         },
-        "kind": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AzureDataBoxGateway",
-                "AzureStackEdge",
-                "AzureStackHub",
-                "AzureModularDataCentre"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The kind of the device."
-        },
         "location": {
           "type": "string",
           "description": "The location of the device. This is a supported and registered Azure geographical region (for example, West US, East US, or Southeast Asia). The geographical region of a device cannot be changed once it is created, but if an identical geographical region is specified on update, the request will succeed."
@@ -1261,26 +1244,6 @@
     "DataBoxEdgeDeviceProperties": {
       "type": "object",
       "properties": {
-        "dataBoxEdgeDeviceStatus": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "ReadyToSetup",
-                "Online",
-                "Offline",
-                "NeedsAttention",
-                "Disconnected",
-                "PartiallyDisconnected",
-                "Maintenance"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The status of the Data Box Edge/Gateway device."
-        },
         "dataResidency": {
           "oneOf": [
             {
diff --git a/schemas/2021-06-01/Microsoft.DataBoxEdge.json b/schemas/2021-06-01/Microsoft.DataBoxEdge.json
index 5b7273f938..7390e2f741 100644
--- a/schemas/2021-06-01/Microsoft.DataBoxEdge.json
+++ b/schemas/2021-06-01/Microsoft.DataBoxEdge.json
@@ -28,23 +28,6 @@
           ],
           "description": "Msi identity details of the resource"
         },
-        "kind": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AzureDataBoxGateway",
-                "AzureStackEdge",
-                "AzureStackHub",
-                "AzureModularDataCentre"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The kind of the device."
-        },
         "location": {
           "type": "string",
           "description": "The location of the device. This is a supported and registered Azure geographical region (for example, West US, East US, or Southeast Asia). The geographical region of a device cannot be changed once it is created, but if an identical geographical region is specified on update, the request will succeed."
@@ -1261,26 +1244,6 @@
     "DataBoxEdgeDeviceProperties": {
       "type": "object",
       "properties": {
-        "dataBoxEdgeDeviceStatus": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "ReadyToSetup",
-                "Online",
-                "Offline",
-                "NeedsAttention",
-                "Disconnected",
-                "PartiallyDisconnected",
-                "Maintenance"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The status of the Data Box Edge/Gateway device."
-        },
         "dataResidency": {
           "oneOf": [
             {
diff --git a/schemas/2022-03-01/Microsoft.DataBoxEdge.json b/schemas/2022-03-01/Microsoft.DataBoxEdge.json
index 05d604c0ec..b731354475 100644
--- a/schemas/2022-03-01/Microsoft.DataBoxEdge.json
+++ b/schemas/2022-03-01/Microsoft.DataBoxEdge.json
@@ -28,23 +28,6 @@
           ],
           "description": "Msi identity details of the resource"
         },
-        "kind": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "AzureDataBoxGateway",
-                "AzureStackEdge",
-                "AzureStackHub",
-                "AzureModularDataCentre"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The kind of the device."
-        },
         "location": {
           "type": "string",
           "description": "The location of the device. This is a supported and registered Azure geographical region (for example, West US, East US, or Southeast Asia). The geographical region of a device cannot be changed once it is created, but if an identical geographical region is specified on update, the request will succeed."
@@ -1107,26 +1090,6 @@
     "DataBoxEdgeDeviceProperties": {
       "type": "object",
       "properties": {
-        "dataBoxEdgeDeviceStatus": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "ReadyToSetup",
-                "Online",
-                "Offline",
-                "NeedsAttention",
-                "Disconnected",
-                "PartiallyDisconnected",
-                "Maintenance"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The status of the Data Box Edge/Gateway device."
-        },
         "dataResidency": {
           "oneOf": [
             {