diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json
index e4b57537049d..56156cbd4816 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json
@@ -8,9 +8,6 @@
   "responses": {
     "200": {
       "headers": {}
-    },
-    "204": {
-      "headers": {}
     }
   }
 }
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json
index 781ece7c2d33..07b6fa9994f2 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json
@@ -6,7 +6,11 @@
     "api-version": "2018-02-14-preview"
   },
   "responses": {
-    "200": {},
-    "202": {}
+    "200": {
+      "headers": {}
+    },
+    "202": {
+      "headers": {}
+    }
   }
 }
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
index 8145b18b578a..ede2c4ba6953 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
@@ -174,9 +174,6 @@
         "responses": {
           "200": {
             "description": "OK Response."
-          },
-          "204": {
-            "description": "No Content."
           }
         },
         "x-ms-examples": {
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json
index 6d1b457281ab..07ebc970138f 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json
@@ -1122,13 +1122,7 @@
         },
         "enableSoftDelete": {
           "type": "boolean",
-          "default": true,
-          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If it's not set to any value(true or false) when creating new key vault, it will be set to true by default. Once it's been set to true value, it can NOT be reverted to false."
-        },
-        "softDeleteRetentionInDays": {
-          "type": "integer",
-          "format": "int32",
-          "description": "softDelete data retention days. It accepts >=7 and <=90."
+          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If omitted, assume true as default value. Once set to true, cannot be reverted to false."
         },
         "createMode": {
           "type": "string",
@@ -1197,13 +1191,7 @@
         },
         "enableSoftDelete": {
           "type": "boolean",
-          "default": false,
-          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If omitted, assume false as default value when patching an existing vault. Once set to true, cannot be reverted to false."
-        },
-        "softDeleteRetentionInDays": {
-          "type": "integer",
-          "format": "int32",
-          "description": "softDelete data retention days. It accepts >=7 and <=90."
+          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If omitted, assume true as default value. Once set to true, cannot be reverted to false."
         },
         "createMode": {
           "type": "string",