diff --git a/windows/client-management/mdm/policies-in-policy-csp-admx-backed.md b/windows/client-management/mdm/policies-in-policy-csp-admx-backed.md
index e88516dcd6..0a24fe8c1b 100644
--- a/windows/client-management/mdm/policies-in-policy-csp-admx-backed.md
+++ b/windows/client-management/mdm/policies-in-policy-csp-admx-backed.md
@@ -163,10 +163,6 @@ ms.date: 10/08/2020
- [ADMX_DigitalLocker/Digitalx_DiableApplication_TitleText_1](./policy-csp-admx-digitallocker.md#admx-digitallocker-digitalx-diableapplication-titletext-1)
- [ADMX_DigitalLocker/Digitalx_DiableApplication_TitleText_2](./policy-csp-admx-digitallocker.md#admx-digitallocker-digitalx-diableapplication-titletext-2)
- [ADMX_DistributedLinkTracking/DLT_AllowDomainMode](./policy-csp-admx-distributedlinktracking.md#admx-distributedlinktracking-dlt_allowdomainmode)
-- [ADMX_DiskNVCache/BootResumePolicy](./policy-csp-admx-disknvcache.md#admx-disknvcache-bootresumepolicy)
-- [ADMX_DiskNVCache/CachePowerModePolicy](./policy-csp-admx-disknvcache.md#admx-disknvcache-cachepowermodepolicy)
-- [ADMX_DiskNVCache/FeatureOffPolicy](./policy-csp-admx-disknvcache.md#admx-disknvcache-featureoffpolicy)
-- [ADMX_DiskNVCache/SolidStatePolicy](./policy-csp-admx-disknvcache.md#admx-disknvcache-solidstatepolicy)
- [ADMX_DnsClient/DNS_AllowFQDNNetBiosQueries](./policy-csp-admx-dnsclient.md#admx-dnsclient-dns-allowfqdnnetbiosqueries)
- [ADMX_DnsClient/DNS_AppendToMultiLabelName](./policy-csp-admx-dnsclient.md#admx-dnsclient-dns-appendtomultilabelname)
- [ADMX_DnsClient/DNS_Domain](./policy-csp-admx-dnsclient.md#admx-dnsclient-dns-domain)
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 094dfa1b2f..910bfd4f8e 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -705,23 +705,6 @@ The following diagram shows the Policy configuration service provider in tree fo
-### ADMX_DiskNVCache policies
-
-
-
--
- ADMX_DiskNVCache/BootResumePolicy
-
- -
- ADMX_DiskNVCache/CachePowerModePolicy
-
- -
- ADMX_DiskNVCache/FeatureOffPolicy
-
- -
- ADMX_DiskNVCache/SolidStatePolicy
-
-
### ADMX_DnsClient policies
diff --git a/windows/client-management/mdm/policy-csp-admx-disknvcache.md b/windows/client-management/mdm/policy-csp-admx-disknvcache.md
deleted file mode 100644
index 0535130b2e..0000000000
--- a/windows/client-management/mdm/policy-csp-admx-disknvcache.md
+++ /dev/null
@@ -1,367 +0,0 @@
----
-title: Policy CSP - ADMX_DiskNVCache
-description: Policy CSP - ADMX_DiskNVCache
-ms.author: dansimp
-ms.localizationpriority: medium
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nimishasatapathy
-ms.date: 09/09/2021
-ms.reviewer:
-manager: dansimp
----
-
-# Policy CSP - ADMX_DiskNVCache
-> [!WARNING]
-> Some information relates to prereleased products, which may be substantially modified before it's commercially released. Microsoft makes no warranties, expressed or implied, concerning the information provided here.
-
-
-
-
-## ADMX_DiskNVCache policies
-
-
- -
- ADMX_DiskNVCache/BootResumePolicy
-
- -
- ADMX_DiskNVCache/CachePowerModePolicy
-
- -
- ADMX_DiskNVCache/FeatureOffPolicy
-
- -
- ADMX_DiskNVCache/SolidStatePolicy
-
-
-
-
-
-
-
-**DiskNVCache/BootResumePolicy**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting turns off the boot and resume optimizations for the hybrid hard disks in the system.
-
-- If you enable this policy setting, the system does not use the non-volatile (NV) cache to optimize boot and resume.
-- If you disable this policy setting, the system uses the NV cache to achieve faster boot and resume.
-
-The system determines the data that will be stored in the NV cache to optimize boot and resume.
-The required data is stored in the NV cache during shutdown and hibernate, respectively.
-This might cause a slight increase in the time taken for shutdown and hibernate.
-If you do not configure this policy setting, the default behavior is observed and the NV cache is used for boot and resume optimizations.
-
-> [!NOTE]
-> This policy setting is applicable only if the NV cache feature is on.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Turn off boot and resume optimizations*
-- GP name: *BootResumePolicy*
-- GP path: *Windows\NvCache!OptimizeBootAndResume*
-- GP ADMX file name: *DiskNVCache.admx*
-
-
-
-
-
-
-
-**ADMX_DiskNVCache/CachePowerModePolicy**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting turns off power save mode on the hybrid hard disks in the system.
-
-- If you enable this policy setting, the hard disks are not put into NV cache power save mode and no power savings are achieved.
-- If you disable this policy setting, the hard disks are put into an NV cache power saving mode.
-
-In this mode, the system tries to save power by aggressively spinning down the disk.
-If you do not configure this policy setting, the default behavior is to allow the hybrid hard disks to be in power save mode.
-
-> [!NOTE]
-> This policy setting is applicable only if the NV cache feature is on.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Turn off cache power mode*
-- GP name: *DiskNVCache/CachePowerModePolicy*
-- GP path: *Windows\NvCache!EnablePowerModeState*
-- GP ADMX file name: *DiskNVCache.admx*
-
-
-
-
-
-
-**ADMX_DiskNVCache/FeatureOffPolicy**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
- Enterprise |
- Yes |
- Yes |
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Machine
-
-
-
-
-
-This policy setting turns off all support for the non-volatile (NV) cache on all hybrid hard disks in the system.
-
-To check if you have hybrid hard disks in the system, from Device Manager, right-click the disk drive and select Properties.
-
-The NV cache can be used to optimize boot and resume by reading data from the cache while the disks are spinning up.
-The NV cache can also be used to reduce the power consumption of the system by keeping the disks spun down while satisfying reads and writes from the cache.
-- If you enable this policy setting, the system will not manage the NV cache and will not enable NV cache power saving mode.
-- If you disable this policy setting, the system will manage the NV cache on the disks if the other policy settings for the NV cache are appropriately configured.
-
-> [!NOTE]
-> This policy setting will take effect on next boot. If you do not configure this policy setting, the default behavior is to turn on support for the NV cache.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Turn off non-volatile cache feature*
-- GP name: *DiskNVCache/FeatureOffPolicy*
-- GP path: *Windows\NvCache!EnableNvCache*
-- GP ADMX file name: *DiskNVCache.admx*
-
-
-
-
-
-
-**ADMX_DiskNVCache/SolidStatePolicy**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting turns off the solid state mode for the hybrid hard disks.
-- If you enable this policy setting, frequently written files such as the file system metadata and registry may not be stored in the NV cache.
-- If you disable this policy setting, the system will store frequently written data into the non-volatile (NV) cache.
-
-This allows the system to exclusively run out of the NV cache and power down the disk for longer periods to save power.
-
-> [!NOTE]
-> This can cause increased wear of the NV cache. If you do not configure this policy setting, the default behavior of the system is observed and frequently written files will be stored in the NV cache.
-
-> [!NOTE]
-> This policy setting is applicable only if the NV cache feature is on.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Turn off solid state mode*
-- GP name: *DiskNVCache/SolidStatePolicy*
-- GP path: *Windows\NvCache!EnableSolidStateMode*
-- GP ADMX file name: *DiskNVCache.admx*
-
-
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/policy-csp-admx-diskquota.md b/windows/client-management/mdm/policy-csp-admx-diskquota.md
deleted file mode 100644
index b9a51a2def..0000000000
--- a/windows/client-management/mdm/policy-csp-admx-diskquota.md
+++ /dev/null
@@ -1,386 +0,0 @@
----
-title: Policy CSP - ADMX_DiskQuota
-description: Policy CSP - ADMX_DiskQuota
-ms.author: dansimp
-ms.localizationpriority: medium
-ms.topic: article
-ms.prod: w10
-ms.technology: windows
-author: nimishasatapathy
-ms.date: 09/12/2021
-ms.reviewer:
-manager: dansimp
----
-
-# Policy CSP - ADMX_DiskQuota
-
-> [!WARNING]
-> Some information relates to prereleased products, which may be substantially modified before it's commercially released. Microsoft makes no warranties, expressed or implied, concerning the information provided here.
-
-
-
-
-## ADMX_DiskQuota policies
-
-
- -
- ADMX_DiskQuota/DQ_RemovableMedia
-
- -
- ADMX_DiskQuota/DQ_Enable
-
- -
- ADMX_DiskQuota/DQ_Enforce
-
- -
- ADMX_DiskQuota/DQ_LogEventOverLimit
-
- -
- ADMX_DiskQuota/DQ_LogEventOverThreshold
-
- -
- ADMX_DiskQuota/DQ_Limit
-
-
-
-
-
-
-
-**ADMX_diskquota/DQ_RemovableMedia**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting extends the disk quota policies in this folder to NTFS file system volumes on removable media.
-
-If you disable or do not configure this policy setting, the disk quota policies established in this folder apply to fixed-media NTFS volumes only.
-
-> [!NOTE]
-> When this policy setting is applied, the computer will apply the disk quota to both fixed and removable media.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Apply policy to removable media*
-- GP name: *DQ_RemovableMedia*
-- GP path: *System\Disk Quotas*
-- GP ADMX file name: *DiskQuota.admx*
-
-
-
-
-
-
-
-
-**ADMX_DiskQuota/DQ_Enable**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting turns on and turns off disk quota management on all NTFS volumes of the computer, and prevents users from changing the setting.
-
-- If you enable this policy setting, disk quota management is turned on, and users cannot turn it off.
-
-- If you disable the policy setting, disk quota management is turned off, and users cannot turn it on.
-
-If this policy setting is not configured, disk quota management is turned off by default, but administrators can turn it on.
-
-To prevent users from changing the setting while a setting is in effect, the system disables the "Enable quota management" option on the Quota tab of NTFS volumes.
-
-> [!NOTE]
-> This policy setting turns on disk quota management but does not establish or enforce a particular disk quota limit.
-
-To specify a disk quota limit, use the "Default quota limit and warning level" policy setting. Otherwise, the system uses the physical space on the volume as the quota limit.
-
-> [!NOTE]
-> To turn on or turn off disk quota management without specifying a setting, in My Computer, right-click the name of an NTFS volume, click **Properties**, click the **Quota** tab, and then click **Enable quota management**.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Enable disk quotas*
-- GP name: *DQ_Enable*
-- GP path: *Windows NT\DiskQuota!Enable*
-- GP ADMX file name: *DiskQuota.admx*
-
-
-
-
-
-
-
-
-**ADMX_DiskQuota/DQ_Enforce**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting specifies the default disk quota limit and warning level for new users of the volume.
-
-This policy setting determines how much disk space can be used by each user on each of the NTFS file system volumes on a computer.
-It also specifies the warning level, the point at which the user's status in the Quota Entries window changes to indicate that the user is approaching the disk quota limit.
-
-This setting overrides new users’ settings for the disk quota limit and warning level on their volumes, and it disables the corresponding options in the "Select the default quota limit for new users of this volume" section on the Quota tab.
-
-This policy setting applies to all new users as soon as they write to the volume. It does not affect disk quota limits for current users, or affect customized limits and warning levels set for particular users (on the Quota tab in Volume Properties).
-
-If you disable or do not configure this policy setting, the disk space available to users is not limited. The disk quota management feature uses the physical space on each volume as its quota limit and warning level. When you select a limit, remember that the same limit applies to all users on all volumes, regardless of actual volume size. Ensure to set the limit and warning level so that it is reasonable for the range of volumes in the group.
-
-This policy setting is effective only when disk quota management is enabled on the volume. Also, if disk quotas are not enforced, users can exceed the quota limit you set. When users reach the quota limit, their status in the Quota Entries window changes, but users can continue to write to the volume.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Specify default quota limit and warning level*
-- GP name: *DQ_Enforce*
-- GP path: *Windows NT\DiskQuota!Limit*
-- GP ADMX file name: *DiskQuota.admx*
-
-
-
-
-
-
-
-
-
-
-**ADMX_DiskQuota/DQ_Enforce**
-
-
-
-
- Edition |
- Windows 10 |
- Windows 11 |
-
-
- Home |
- No |
- No |
-
-
- Pro |
- No |
- No |
-
-
- Business |
- No |
- No |
-
-
- Enterprise |
- Yes |
- Yes |
-
-
- Education |
- Yes |
- Yes |
-
-
-
-
-
-
-
-[Scope](./policy-configuration-service-provider.md#policy-scope):
-
-> [!div class = "checklist"]
-> * Device
-
-
-
-
-
-This policy setting specifies the default disk quota limit and warning level for new users of the volume.
-
-This policy setting determines how much disk space can be used by each user on each of the NTFS file system volumes on a computer.
-It also specifies the warning level, the point at which the user's status in the Quota Entries window changes to indicate that the user is approaching the disk quota limit.
-
-This setting overrides new users’ settings for the disk quota limit and warning level on their volumes, and it disables the corresponding options in the "Select the default quota limit for new users of this volume" section on the Quota tab.
-
-This policy setting applies to all new users as soon as they write to the volume. It does not affect disk quota limits for current users, or affect customized limits and warning levels set for particular users (on the Quota tab in Volume Properties).
-
-If you disable or do not configure this policy setting, the disk space available to users is not limited. The disk quota management feature uses the physical space on each volume as its quota limit and warning level. When you select a limit, remember that the same limit applies to all users on all volumes, regardless of actual volume size. Ensure to set the limit and warning level so that it is reasonable for the range of volumes in the group.
-
-This policy setting is effective only when disk quota management is enabled on the volume. Also, if disk quotas are not enforced, users can exceed the quota limit you set. When users reach the quota limit, their status in the Quota Entries window changes, but users can continue to write to the volume.
-
-
-> [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
->
-> You must specify the data type in the SyncML as <Format>chr</Format>. For an example SyncML, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
-
-
-ADMX Info:
-- GP Friendly name: *Specify default quota limit and warning level*
-- GP name: *DQ_LogEventOverLimit*
-- GP path: *Windows NT\DiskQuota!Limit*
-- GP ADMX file name: *DiskQuota.admx*
-
-
-
-
-
-
-> [!NOTE]
-> These policies are currently only available as part of a Windows Insider release.
-
-
\ No newline at end of file
diff --git a/windows/client-management/mdm/toc.yml b/windows/client-management/mdm/toc.yml
index 5c510d70b6..f9f9d0b8a7 100644
--- a/windows/client-management/mdm/toc.yml
+++ b/windows/client-management/mdm/toc.yml
@@ -449,8 +449,6 @@ items:
href: policy-csp-admx-digitallocker.md
- name: ADMX_DistributedLinkTracking
href: policy-csp-admx-distributedlinktracking.md
- - name: ADMX_DiskNVCache
- href: policy-csp-admx-disknvcache.md
- name: ADMX_DnsClient
href: policy-csp-admx-dnsclient.md
- name: ADMX_DWM