diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index acb9196fbb..746050070e 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -1,5 +1,35 @@
 {
   "redirections": [
+    {
+      "source_path": "windows/client-management/mdm/windowssecurityauditing-ddf-file.md",
+      "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+      "redirect_document_id": false  
+    },
+    {
+      "source_path": "windows/client-management/mdm/windowssecurityauditing-csp.md",
+      "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+      "redirect_document_id": false  
+    },
+    {
+      "source_path": "windows/client-management/mdm/remotelock-ddf-file.md",
+      "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+      "redirect_document_id": false  
+    },
+    {
+      "source_path": "windows/client-management/mdm/remotelock-csp.md",
+      "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+      "redirect_document_id": false  
+    },
+    {
+      "source_path": "windows/client-management/mdm/registry-ddf-file.md",
+      "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+      "redirect_document_id": false  
+    },
+    {
+      "source_path": "windows/client-management/mdm/registry-csp.md",
+      "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
+      "redirect_document_id": false  
+    },
     {
       "source_path": "windows/client-management/mdm/maps-ddf-file.md",
       "redirect_url": "https://support.microsoft.com/windows/windows-10-mobile-end-of-support-faq-8c2dd1cf-a571-00f0-0881-bb83926d05c5",
diff --git a/windows/client-management/mdm/devicelock-csp.md b/windows/client-management/mdm/devicelock-csp.md
index 48dcb6b5da..f0d67e6950 100644
--- a/windows/client-management/mdm/devicelock-csp.md
+++ b/windows/client-management/mdm/devicelock-csp.md
@@ -14,6 +14,9 @@ ms.date: 06/26/2017
 
 # DeviceLock CSP
 
+This policy is deprecated. Use [Policy CSP](policy-configuration-service-provider.md) instead.
+
+<!-- 12.16.2021 mandia: Commenting out, as this CSP is specific to Windows Phone 8.1.
 
 The DeviceLock configuration service provider is used by the enterprise management server to configure device lock related policies. This configuration service provider is supported by an enterprise management server.
 
@@ -304,7 +307,10 @@ All node values under the **ProviderID** interior node represent the policy valu
 
 The value applied to the device can be queried via the nodes under the **DeviceValue** interior node.
 
+-->
+
 ## Related articles
 
+[Policy CSP](policy-configuration-service-provider.md)
 
 [Configuration service provider reference](configuration-service-provider-reference.md)
diff --git a/windows/client-management/mdm/devicelock-ddf-file.md b/windows/client-management/mdm/devicelock-ddf-file.md
index 32da74c5a2..c396396f46 100644
--- a/windows/client-management/mdm/devicelock-ddf-file.md
+++ b/windows/client-management/mdm/devicelock-ddf-file.md
@@ -14,6 +14,9 @@ ms.date: 06/26/2017
 
 # DeviceLock DDF file
 
+This policy is deprecated. Use [Policy CSP](policy-configuration-service-provider.md) instead.
+
+<!-- 12.16.2021 mandia: Commenting out, as this CSP is specific to Windows Phone 8.1.
 
 This topic shows the OMA DM device description framework (DDF) for the **DeviceLock** configuration service provider. DDF files are used only with OMA DM provisioning XML.
 
@@ -496,18 +499,10 @@ This topic shows the OMA DM device description framework (DDF) for the **DeviceL
     </Node>
 </MgmtTree>
 ```
+-->
 
 ## Related topics
 
+[Policy CSP](policy-configuration-service-provider.md)
 
 [DeviceLock configuration service provider](devicelock-csp.md)
-
- 
-
- 
-
-
-
-
-
-
diff --git a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
index 107d0c3745..38daca74a6 100644
--- a/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
+++ b/windows/client-management/mdm/enterprisemodernappmanagement-csp.md
@@ -20,7 +20,8 @@ The EnterpriseModernAppManagement configuration service provider (CSP) is used f
 > Windows Holographic only supports per-user configuration of the EnterpriseModernAppManagement CSP.
 
 The following shows the EnterpriseModernAppManagement configuration service provider in tree format.
-```
+
+```console
 ./Vendor/MSFT
 EnterpriseModernAppManagement
 ----AppManagement
@@ -451,7 +452,8 @@ Valid values:
 **Examples:**
 
 Add an app to the nonremovable app policy list 
-```
+
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2">  
     <SyncBody> 
         <Add> 
@@ -472,7 +474,8 @@ Add an app to the nonremovable app policy list
 ```
 
 Get the status for a particular app  
-```
+
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2"> 
     <SyncBody> 
         <Get> 
@@ -491,7 +494,8 @@ Get the status for a particular app
 Replace an app in the nonremovable app policy list  
 Data 0 = app is not in the app policy list  
 Data 1 = app is in the app policy list
-```
+
+```xml
 <SyncML xmlns="SYNCML:SYNCML1.2"> 
     <SyncBody> 
         <Replace> 
@@ -678,13 +682,3 @@ Subsequent query for a specific app for its properties.
 ## Related topics
 
 [Configuration service provider reference](configuration-service-provider-reference.md)
-
-
-
-
-
-
-
-
-
-