diff --git a/docs/tests/acceptance/developer.md b/docs/tests/acceptance/developer.md
index b0a7c76213..f7cd8eb3d6 100644
--- a/docs/tests/acceptance/developer.md
+++ b/docs/tests/acceptance/developer.md
@@ -1,5 +1,20 @@
 # Developer Acceptance Tests
 
+### Clean up instructions for manual tests
+For all these acceptance steps to perform a `cleanup` Uninstall Keyman and any third-party applications installed as part for the `Setup` steps.
+
+If an installation becomes corrupted and it is not possible to uninstall `Keyman Developer` through `Add or remove programs`, clean up the files in the following folders if they exist.
+
+- %ProgramFiles(x86)%\Keyman or %ProgramFiles%\Keyman
+- %CommonProgramFiles(x86)%\Keyman or %CommonProgramFiles%\Keyman
+- %ProgramData%\Keyman
+- %AppData%\Keyman
+- %LocalAppData%\Keyman
+
+If still having trouble remove the registry values at
+- HKCU\Software\Keyman
+- HKLM\Software\Wow6432Node\Keyman
+
 **TEST_241**
 
 Test case for Debugger_Starts ,
diff --git a/docs/tests/acceptance/gestures.md b/docs/tests/acceptance/gestures.md
index 8882113e12..3aba62a05e 100644
--- a/docs/tests/acceptance/gestures.md
+++ b/docs/tests/acceptance/gestures.md
@@ -53,21 +53,6 @@ Original TestLodge ID: TC188
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_288**
@@ -122,21 +107,6 @@ Original TestLodge ID: TC189
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_289**
@@ -190,21 +160,6 @@ Original TestLodge ID: TC190
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_290**
@@ -252,21 +207,6 @@ Original TestLodge ID: TC191
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_291**
@@ -320,20 +260,6 @@ Original TestLodge ID: TC192
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
 **TEST_292**
 
 Test case for BASIC_MODIPRESS_HOLD,
@@ -381,21 +307,6 @@ Original TestLodge ID: TC193
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_293**
@@ -454,21 +365,6 @@ Original TestLodge ID: TC194
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_294**
@@ -522,21 +418,6 @@ Original TestLodge ID: TC195
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_295**
@@ -586,21 +467,6 @@ Original TestLodge ID: TC196
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_297**
@@ -653,21 +519,6 @@ Original TestLodge ID: TC198
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_300**
@@ -733,21 +584,6 @@ Original TestLodge ID: TC201
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_302**
@@ -807,20 +643,5 @@ Original TestLodge ID: TC203
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
diff --git a/docs/tests/acceptance/mac.md b/docs/tests/acceptance/mac.md
index 6262f62111..57f8fd9431 100644
--- a/docs/tests/acceptance/mac.md
+++ b/docs/tests/acceptance/mac.md
@@ -1,5 +1,8 @@
 # macOS Acceptance Tests
 
+### Clean up instructions for manual tests
+For all these acceptance steps to perform a `cleanup` Uninstall Keyman and any third-party applications installed as part for the `Setup` steps.
+
 **TEST_173**
 
 Test case for Chrome_Google_Docs with Amharic,
@@ -48,15 +51,6 @@ Original TestLodge ID: TC113
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall the Chrome browser.
-
-</details>
-
 ---
 
 **TEST_175**
@@ -106,15 +100,6 @@ Original TestLodge ID: TC115
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall Atom Editor.
-
-</details>
-
 ---
 
 **TEST_178**
@@ -165,15 +150,6 @@ Original TestLodge ID: TC118
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall Safari browser.
-
-</details>
-
 ---
 
 **TEST_180**
@@ -224,15 +200,6 @@ Original TestLodge ID: TC120
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall the Firefox browser.
-
-</details>
-
 ---
 
 **TEST_183**
@@ -283,15 +250,6 @@ Original TestLodge ID: TC123
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall the Firefox browser.
-
-</details>
-
 ---
 
 **TEST_185**
@@ -341,15 +299,6 @@ Original TestLodge ID: TC125
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall Notes App.
-
-</details>
-
 ---
 
 **TEST_188**
@@ -399,15 +348,6 @@ Original TestLodge ID: TC128
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall the Amharic keyboard.
-3. Uninstall LibreOffice 7.0 app.
-
-</details>
-
 ---
 
 **TEST_190**
@@ -469,14 +409,6 @@ Original TestLodge ID: TC130
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall Chrome browser.
-
-</details>
-
 ---
 
 **TEST_193**
@@ -539,14 +471,6 @@ Original TestLodge ID: TC133
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall Chrome browser.
-
-</details>
-
 ---
 
 **TEST_195**
@@ -608,13 +532,6 @@ Original TestLodge ID: TC135
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-
-</details>
-
 ---
 
 **TEST_198**
@@ -676,13 +593,6 @@ Original TestLodge ID: TC138
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-
-</details>
-
 ---
 
 **TEST_200**
@@ -747,13 +657,6 @@ Original TestLodge ID: TC140
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-
-</details>
-
 ---
 
 **TEST_203**
@@ -815,13 +718,6 @@ Original TestLodge ID: TC143
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-
-</details>
-
 ---
 
 **TEST_205**
@@ -882,12 +778,6 @@ Original TestLodge ID: TC145
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-
-</details>
 **TEST_208**
 
 Test case for MAIL app with Shortcuts,
@@ -946,13 +836,6 @@ Original TestLodge ID: TC148
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-
-</details>
-
 ---
 
 **TEST_210**
@@ -995,14 +878,6 @@ Original TestLodge ID: TC222
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall Chrome browser.
-
-</details>
-
 ---
 
 **TEST_213**
@@ -1047,14 +922,6 @@ Original TestLodge ID: TC225
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall Chrome browser.
-
-</details>
-
 ---
 
 **TEST_215**
@@ -1094,13 +961,6 @@ Original TestLodge ID: TC235
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the MAC
-
-</details>
-
 ---
 
 **TEST_218**
@@ -1142,14 +1002,6 @@ Original TestLodge ID: TC238
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the MAC
-SUITE_KMX_PROCESSOR_COMPLIANT_GROUP_LINUX:
-
-</details>
-
 ---
 
 **TEST_220**
@@ -1193,14 +1045,6 @@ Original TestLodge ID: TC250
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall Chrome browser.
-
-</details>
-
 ---
 
 **TEST_223**
@@ -1245,14 +1089,6 @@ Original TestLodge ID: TC253
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the device.
-2. Uninstall Chrome browser.
-
-</details>
-
 ---
 
 **TEST_226**
@@ -1295,14 +1131,6 @@ Original TestLodge ID: TC266
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the macOS
-2. Uninstall the TextEdit app.
-
-</details>
-
 ---
 
 **TEST_228**
@@ -1345,14 +1173,6 @@ Original TestLodge ID: TC268
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the macOS
-2. Uninstall the TextEdit app.
-
-</details>
-
 ---
 
 **TEST_231**
@@ -1401,13 +1221,6 @@ Original TestLodge ID: TC286
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall the Keyman build on the macOS.
-
-</details>
-
 ---
 
 **TEST_233**
@@ -1451,13 +1264,6 @@ Original TestLodge ID: TC288
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall the Keyman build on the macOS.
-
-</details>
-
 ---
 
 **TEST_236**
@@ -1505,13 +1311,6 @@ Original TestLodge ID: TC291
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall the Keyman build on the macOS.
-
-</details>
-
 ---
 
 **TEST_238**
@@ -1558,13 +1357,6 @@ Original TestLodge ID: TC293
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall the Keyman build on the macOS.
-
-</details>
-
 ---
 
 **TEST_341**
@@ -1618,12 +1410,5 @@ TC - fix(mac): handle PackageInfo section in kmp.inf file #13876
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1.    Uninstall the Keyman build on macOS.
-
-</details>
-
 ---
 
diff --git a/docs/tests/acceptance/web.md b/docs/tests/acceptance/web.md
index e8ca5f6b7d..c915c05517 100644
--- a/docs/tests/acceptance/web.md
+++ b/docs/tests/acceptance/web.md
@@ -36,7 +36,7 @@ Original TestLodge ID: TC162
 
 1. Open Firefox browser in Windows OS.
 2. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
+3. Verify that the testing index page opens.
 4. Click 'View Keymanweb use samples' link button.
 5. Verify KeymanWeb Samples page opens.
 6. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -45,7 +45,7 @@ Original TestLodge ID: TC162
 9. Verify it produces ‘ŋ’
 10. Open Chrome browser in Windows OS.
 11. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-12.Verify that the testing index page opens.
+12. Verify that the testing index page opens.
 13. Click 'View Keymanweb use samples' link button.
 14. Verify KeymanWeb Samples page opens.
 15. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -54,7 +54,7 @@ Original TestLodge ID: TC162
 18. Verify it produces ‘ŋ’
 19. Open Safari browser in macOS.
 20.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-21.Verify that the testing index page opens.
+21. Verify that the testing index page opens.
 22. Click 'View Keymanweb use samples' link button.
 23. Verify KeymanWeb Samples page opens.
 24. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -63,7 +63,7 @@ Original TestLodge ID: TC162
 27. Verify it produces ‘ŋ’
 28. Open Chrome browser in macOS.
 29. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-30.Verify that the testing index page opens.
+30. Verify that the testing index page opens.
 31. Click 'View Keymanweb use samples' link button.
 32. Verify KeymanWeb Samples page opens.
 33. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -72,7 +72,7 @@ Original TestLodge ID: TC162
 36. Verify it produces ‘ŋ’
 37. Open Firefox in macOS.
 38. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-39.Verify that the testing index page opens.
+39. Verify that the testing index page opens.
 40. Click 'View Keymanweb use samples' link button.
 41. Verify KeymanWeb Samples page opens.
 42. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -81,7 +81,7 @@ Original TestLodge ID: TC162
 45. Verify it produces ‘ŋ’
 46. Open Firefox in Linux OS.
 47.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-48.Verify that the testing index page opens.
+48. Verify that the testing index page opens.
 49. Click 'View Keymanweb use samples' link button.
 50. Verify KeymanWeb Samples page opens.
 51. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -141,7 +141,7 @@ Original TestLodge ID: TC163
 
 1. Open Firefox browser in Windows OS.
 2. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/433344:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
+3. Verify that the testing index page opens.
 4. Click 'View Keymanweb use samples' link button.
 5. Verify KeymanWeb Samples page opens.
 6. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -151,7 +151,7 @@ Original TestLodge ID: TC163
 10. Verify that the Khmer Angkor keyboard is added and displayed on the Screen.
 11. Open Chrome browser in Windows OS.
 12.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-13.Verify that the testing index page opens.
+13. Verify that the testing index page opens.
 14. Click 'View Keymanweb use samples' link button.
 15. Verify KeymanWeb Samples page opens.
 16. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -161,7 +161,7 @@ Original TestLodge ID: TC163
 20. Verify that the Khmer Angkor keyboard is added and displayed on the Screen.
 21. Open Safari browser in macOS.
 22. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-23.Verify that the testing index page opens.
+23. Verify that the testing index page opens.
 24. Click 'View Keymanweb use samples' link button.
 25. Verify KeymanWeb Samples page opens.
 26. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -171,7 +171,7 @@ Original TestLodge ID: TC163
 30. Verify that the Khmer Angkor keyboard is added and displayed on the Screen.
 31. Open Chrome browser in macOS.
 32.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-33.Verify that the testing index page opens.
+33. Verify that the testing index page opens.
 34. Click 'View Keymanweb use samples' link button.
 35. Verify KeymanWeb Samples page opens.
 36. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -181,7 +181,7 @@ Original TestLodge ID: TC163
 40. Verify that the Khmer Angkor keyboard is added and displayed on the Screen.
 41. Open Firefox browser in macOS.
 42. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-43.Verify that the testing index page opens.
+43. Verify that the testing index page opens.
 44. Click 'View Keymanweb use samples' link button.
 45. Verify KeymanWeb Samples page opens.
 46. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -191,7 +191,7 @@ Original TestLodge ID: TC163
 50. Verify that the Khmer Angkor keyboard is added and displayed on the Screen.
 51. Open Firefox browser in Linux OS.
 52.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-53.Verify that the testing index page opens.
+53. Verify that the testing index page opens.
 54. Click 'View Keymanweb use samples' link button.
 55. Verify KeymanWeb Samples page opens.
 56. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -252,7 +252,7 @@ Original TestLodge ID: TC164
 
 1. Open Firefox browser in Windows OS.
 2.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
+3. Verify that the testing index page opens.
 4. Click 'View Keymanweb use samples' link button.
 5. Verify KeymanWeb Samples page opens.
 6. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -276,7 +276,7 @@ Original TestLodge ID: TC164
 24. Verify it deletes the remaining letter on the screen.
 25. Open Chrome browser in Windows OS.
 22.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-23.Verify that the testing index page opens.
+23. Verify that the testing index page opens.
 24. Click 'View Keymanweb use samples' link button.
 25. Verify KeymanWeb Samples page opens.
 26. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -300,7 +300,7 @@ Original TestLodge ID: TC164
 40. Verify it deletes the remaining letter on the screen.
 41. Open Safari browser in macOS
 42. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-43.Verify that the testing index page opens.
+43. Verify that the testing index page opens.
 44. Click 'View Keymanweb use samples' link button.
 45. Verify KeymanWeb Samples page opens.
 46. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -324,7 +324,7 @@ Original TestLodge ID: TC164
 64. Verify it deletes the remaining letter on the screen.
 61. Open Chrome browser in macOS.
 62.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-63.Verify that the testing index page opens.
+63. Verify that the testing index page opens.
 64. Click 'View Keymanweb use samples' link button.
 65. Verify KeymanWeb Samples page opens.
 66. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -348,7 +348,7 @@ Original TestLodge ID: TC164
 84. Verify it deletes the remaining letter on the screen.
 85. Open Firefox browser in macOS.
 86.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-87.Verify that the testing index page opens.
+87. Verify that the testing index page opens.
 88. Click 'View Keymanweb use samples' link button.
 89. Verify KeymanWeb Samples page opens.
 90. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -372,7 +372,7 @@ Original TestLodge ID: TC164
 108. Verify it deletes the remaining letter on the screen.
 101. Open Firefox browser in Linux OS.
 102. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-103.Verify that the testing index page opens.
+103. Verify that the testing index page opens.
 104. Click 'View Keymanweb use samples' link button.
 105. Verify KeymanWeb Samples page opens.
 106. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -447,7 +447,7 @@ Original TestLodge ID: TC165
 
 1. Open Firefox browser in Windows OS.
 2. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
+3. Verify that the testing index page opens.
 4. Click 'View Keymanweb use samples' link button.
 5. Verify KeymanWeb Samples page opens.
 6. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -458,7 +458,7 @@ Original TestLodge ID: TC165
 11. Verify that a Spanish keyboard is added to the list.
 12. Open Chrome browser in Windows OS.
 13.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-14.Verify that the testing index page opens.
+14. Verify that the testing index page opens.
 15. Click 'View Keymanweb use samples' link button.
 16. Verify KeymanWeb Samples page opens.
 17. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -469,7 +469,7 @@ Original TestLodge ID: TC165
 22. Verify that a Spanish keyboard is added to the list.
 23. Open Safari browser in macOS.
 24.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-25.Verify that the testing index page opens.
+25. Verify that the testing index page opens.
 26. Click 'View Keymanweb use samples' link button.
 27. Verify KeymanWeb Samples page opens.
 28. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -480,7 +480,7 @@ Original TestLodge ID: TC165
 33. Verify that a Spanish keyboard is added to the list.
 34. Open Chrome browser in macOS.
 35.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-36.Verify that the testing index page opens.
+36. Verify that the testing index page opens.
 37. Click 'View Keymanweb use samples' link button.
 38. Verify KeymanWeb Samples page opens.
 39. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -491,7 +491,7 @@ Original TestLodge ID: TC165
 44. Verify that a Spanish keyboard is added to the list.
 45. Open Firefox browser in macOS.
 46. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-47.Verify that the testing index page opens.
+47. Verify that the testing index page opens.
 48. Click 'View Keymanweb use samples' link button.
 49. Verify KeymanWeb Samples page opens.
 50. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -502,7 +502,7 @@ Original TestLodge ID: TC165
 55. Verify that a Spanish keyboard is added to the list.
 56. Open Firefox browser in Linux OS.
 57.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-58.Verify that the testing index page opens.
+58. Verify that the testing index page opens.
 59. Click 'View Keymanweb use samples' link button.
 60. Verify KeymanWeb Samples page opens.
 61. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -564,7 +564,7 @@ Original TestLodge ID: TC166
 
 1. Open Firefox browser in Windows OS.
 2.  Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
+3. Verify that the testing index page opens.
 4. Click 'View Keymanweb use samples' link button.
 5. Verify KeymanWeb Samples page opens.
 6. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -677,7 +677,7 @@ Original TestLodge ID: TC167
 45. Type d.
 46. Verify that the final letter should be xdx.
 47. Open Chrome browser in Windows OS.
-48.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+48. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 49. Verify that the testing index page opens.
 50. Click 'View Keymaweb website-oriented manual test pages' link button.
 51. Verify KeymanWeb Samples page opens.
@@ -951,7 +951,7 @@ Original TestLodge ID: TC169
 <summary>Action</summary>
 
 1. Open Firefox browser in Linux OS.
-2.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+2. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 3. Verify that the testing index page opens.
 4. Click 'View Keymaweb website-oriented manual test pages' link button.
 5. Verify KeymanWeb Samples page opens.
@@ -1176,7 +1176,7 @@ Original TestLodge ID: TC171
 11. Click / touch a blank area of the page.
 12. Verify that the OSK should automatically hide.
 13.  Open Chrome in windows OS.
-14.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+14. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 15. Verify that the testing index page opens.
 16. Click 'Tests the new Attachment/Enablement API functionality' link button.
 17. Verify KeymanWeb Samples - Attachment API Testing page opens.
@@ -1293,8 +1293,8 @@ Original TestLodge ID: TC172
 
 1. Open Firefox browser in Windows OS.
 2. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
-4.Click 'Tests the new Attachment/Enablement API functionality' link button.
+3. Verify that the testing index page opens.
+4. Click 'Tests the new Attachment/Enablement API functionality' link button.
 5. Verify KeymanWeb Samples - Attachment API Testing page opens.
 6. Click the ‘Create Inputs’ button one time.
 7. Click the ‘Create Textarea’ button one time.
@@ -1451,7 +1451,7 @@ Verify KeymanWeb Samples - Attachment API Testing page opens.
 15. Click Dynamic area #2.
 16. Verify that the Lao keyboard should be displayed.
 17. Open Chrome browser in Windows OS.
-18.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+18. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 19. Verify that the testing index page opens.
 20. Click 'Tests the new Attachment/Enablement API functionality' link button.
 21. Verify KeymanWeb Samples - Attachment API Testing page opens.
@@ -1523,7 +1523,7 @@ Verify KeymanWeb Samples - Attachment API Testing page opens.
 87. Click Dynamic area #2.
 88. Verify that the Lao keyboard should be displayed.
 89. Open Firefox browser in macOS.
-90.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+90. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 91. Verify that the testing index page opens.
 92. Click 'Tests the new Attachment/Enablement API functionality' link button.
 93. Verify KeymanWeb Samples - Attachment API Testing page opens.
@@ -1628,7 +1628,7 @@ Original TestLodge ID: TC174
 15. Type 2.
 16. Verify the second option should replace the context.
 17. Open Chrome browser in Windows OS.
-18.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+18. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 19. Verify that the testing index page opens.
 20. Click 'View Keymaweb website-oriented manual test pages' link button.
 21. Verify KeymanWeb Samples page opens.
@@ -1644,7 +1644,7 @@ Original TestLodge ID: TC174
 31. Type 2.
 32. Verify the second option should replace the context.
 33. Open Safari browser in macOS.
-34.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+34. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 35. Verify that the testing index page opens.
 36. Click 'View Keymaweb website-oriented manual test pages' link button.
 37. Verify KeymanWeb Samples page opens.
@@ -1692,7 +1692,7 @@ Original TestLodge ID: TC174
 80. Type 2.
 81. Verify the second option should replace the context.
 82. Open Firefox in Linux OS.
-83.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+83. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 84. Verify that the testing index page opens.
 85. Click 'View Keymaweb website-oriented manual test pages' link button.
 86. Verify KeymanWeb Samples page opens.
@@ -1760,10 +1760,10 @@ Original TestLodge ID: TC175
 
 1. Open Firefox browser in Windows OS.
 2. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-3.Verify that the testing index page opens.
+3. Verify that the testing index page opens.
 4. Click 'View Keymaweb website-oriented manual test pages' link button.
 5. Verify KeymanWeb Samples page opens.
-6.Click 'Test unminified Keymanweb' link button.
+6. Click 'Test unminified Keymanweb' link button.
 7. Verify the corresponding KeymaWeb Sample page opens.
 8. Type 'japanese' under "Add a keyboard by keyboard name" text box.
 9. Click Add button.
@@ -1843,7 +1843,7 @@ Original TestLodge ID: TC175
 83. Verify that the OSK should remain visible.
 84. Verify the caret should move from the input control to the textarea control.
 85. Open Chrome browser in macOS.
-86.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+86. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 87. Verify that the testing index page opens.
 88. Click 'View Keymaweb website-oriented manual test pages' link button.
 89. Verify KeymanWeb Samples page opens.
@@ -2028,7 +2028,7 @@ Original TestLodge ID: TC176
 49.  Verify that the letter ‘ŋ’ appears on the text input screen.
 50. Click the Safari browser in iPad Tablet.
 51. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
-52.Verify that the testing index page opens.
+52. Verify that the testing index page opens.
 53. Click 'View Keymanweb use samples' link button.
 54. Verify KeymanWeb Samples page opens.
 55. Click 'Example1 - Toggle UI, all resources in same folder as page' link button.
@@ -2039,7 +2039,7 @@ Original TestLodge ID: TC176
 60. Long-press ‘n’ key, while keeping the finger down, move on the long-press options ‘ŋ‘ so it's highlighted, and release.
 61.  Verify that the letter ‘ŋ’ appears on the text input screen.
 62. Click the Safari browser in the iPad Tablet with a physical keyboard.
-63.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+63. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 64. Verify that the testing index page opens.
 65. Click 'View Keymanweb use samples' link button.
 66. Verify KeymanWeb Samples page opens.
@@ -2262,7 +2262,7 @@ Original TestLodge ID: TC178
 48. Hit Backspace key.
 49. Verify that it shows an empty text area.
 50. Click the Safari browser in an iPhone Mobile.
-51.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+51. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 52. Verify that the testing index page opens.
 53. Click 'View Keymanweb use samples' link button.
 54. Verify KeymanWeb Samples page opens.
@@ -2432,7 +2432,7 @@ Original TestLodge ID: TC179
 20. Click the Add button.
 21. Verify that the Spanish keyboard is added to the list.
 22. Click Safari browser in an iPhone Mobile.
-23.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+23. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 24. Verify that the testing index page opens.
 25. Click 'View Keymanweb use samples' link button.
 26. Verify KeymanWeb Samples page opens.
@@ -2807,7 +2807,7 @@ Original TestLodge ID: TC182
 8. Verify that manual attachment mode results in a page with no KMW-activated controls.
 9. Verify that the KeymanWeb is properly attached to and detaches from each relevant type of control with the page’s API-interface controls.
 10. Click the Chrome browser icon in an Android Mobile device attached with a physical keyboard.
-11.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+11. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 12. Verify that the testing index page opens.
 13. Click 'View Keymanweb website-oriented manual test pages' link button.
 14. Verify KeymanWeb 17 Testing page opens.
@@ -3081,7 +3081,7 @@ Original TestLodge ID: TC184
 16. Click / touch a blank area of the page.
 17. Verify that the OSK should automatically hide.
 18. Click the Chrome browser in Android mobile attached with physical keyboard
-19.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+19. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 20. Verify that the testing index page opens.
 21. Click 'View Keymanweb website-oriented manual test pages' link button.
 22. Verify KeymanWeb 17 Testing page opens.
@@ -3132,7 +3132,7 @@ Original TestLodge ID: TC184
 73. Click / touch a blank area of the page.
 74. Verify that the OSK should automatically hide.
 75. Click the Safari browser icon on the iPad device.
-76.Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
+76. Enter ‘https://build.palaso.org/repository/download/Keymanweb_TestPullRequests/391530:id/index.html' in the Search bar.
 77. Verify that the testing index page opens.
 78. Click 'View Keymanweb website-oriented manual test pages' link button.
 79. Verify KeymanWeb 17 Testing page opens.
diff --git a/docs/tests/acceptance/windows.md b/docs/tests/acceptance/windows.md
index b8edc32dc9..dce81ce2f9 100644
--- a/docs/tests/acceptance/windows.md
+++ b/docs/tests/acceptance/windows.md
@@ -1,5 +1,20 @@
 # Windows Acceptance Tests
 
+### Clean up instructions for manual tests
+For all these acceptance steps to perform a `cleanup` Uninstall Keyman and any third-party applications installed as part for the `Setup` steps.
+
+If an installation becomes corrupted and it is not possible to uninstall `Keyman for Windows` through `Add or remove programs`, clean up the files in the following folders if they exist.
+
+- %ProgramFiles(x86)%\Keyman or %ProgramFiles%\Keyman
+- %CommonProgramFiles(x86)%\Keyman or %CommonProgramFiles%\Keyman
+- %ProgramData%\Keyman
+- %AppData%\Keyman
+- %LocalAppData%\Keyman
+
+If still having trouble remove the registry values at
+- HKCU\Software\Keyman
+- HKLM\Software\Wow6432Node\Keyman
+
 **TEST_1**
 
 Test case for INSTALL Keyman
@@ -56,21 +71,6 @@ Original TestLodge ID: TC01
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version  from the list.
-8. Click the Uninstall option.
-9. Verify that the Keyman Uninstallation completed successfully.
-
-</details>
-
 ---
 
 **TEST_2**
@@ -134,21 +134,6 @@ Original TestLodge ID: TC02
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_3**
@@ -203,21 +188,6 @@ Original TestLodge ID: TC03
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_4**
@@ -269,21 +239,6 @@ Original TestLodge ID: TC04
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_5**
@@ -328,21 +283,6 @@ Original TestLodge ID: TC05
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.yman 16.0’  from the list.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_6**
@@ -367,9 +307,9 @@ Original TestLodge ID: TC06
 <details>
 <summary>Setup</summary>
 
-1.Install Keyman latest  Stable build from Keyman.com site.
-2.Install CapsLock Keyboard.
-3.CapsLock is currently on
+1. Install Keyman latest  Stable build from Keyman.com site.
+2. Install CapsLock Keyboard.
+3. CapsLock is currently on
 4. Currently active keyboard is the CapsLock Keyboard.
 
 </details>
@@ -384,21 +324,6 @@ Original TestLodge ID: TC06
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_7**
@@ -423,10 +348,10 @@ Original TestLodge ID: TC07
 <details>
 <summary>Setup</summary>
 
-1.Install Keyman latest  Stable build from Keyman.com Site.
-2.Install CapsLock Keyboard.
+1. Install Keyman latest  Stable build from Keyman.com Site.
+2. Install CapsLock Keyboard.
 3. CapsLock is currently on
-4.Currently active keyboard is the CapsLock Keyboard.
+4. Currently active keyboard is the CapsLock Keyboard.
 
 </details>
 
@@ -440,21 +365,6 @@ Original TestLodge ID: TC07
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_8**
@@ -496,21 +406,6 @@ Original TestLodge ID: TC08
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_9**
@@ -552,21 +447,6 @@ Original TestLodge ID: TC09
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_10**
@@ -608,21 +488,6 @@ Original TestLodge ID: TC10
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_11**
@@ -667,21 +532,6 @@ Original TestLodge ID: TC11
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_12**
@@ -728,21 +578,6 @@ Original TestLodge ID: TC12
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_13**
@@ -789,21 +624,6 @@ Original TestLodge ID: TC13
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_14**
@@ -848,21 +668,6 @@ Original TestLodge ID: TC14
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_15**
@@ -908,21 +713,6 @@ Original TestLodge ID: TC15
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_16**
@@ -964,21 +754,6 @@ Original TestLodge ID: TC16
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_17**
@@ -1022,21 +797,6 @@ Original TestLodge ID: TC17
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_18**
@@ -1081,21 +841,6 @@ Original TestLodge ID: TC18
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_19**
@@ -1139,21 +884,6 @@ Original TestLodge ID: TC19
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_20**
@@ -1198,21 +928,6 @@ Original TestLodge ID: TC20
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_21**
@@ -1273,21 +988,6 @@ Original TestLodge ID: TC21
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version  from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_22**
@@ -1331,21 +1031,6 @@ Original TestLodge ID: TC22
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_23**
@@ -1389,21 +1074,6 @@ Original TestLodge ID: TC23
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_24**
@@ -1462,21 +1132,6 @@ Original TestLodge ID: TC24
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_25**
@@ -1535,21 +1190,6 @@ Original TestLodge ID: TC25
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_26**
@@ -1582,7 +1222,7 @@ Original TestLodge ID: TC26
 6. Create New>DWORD(32-bit) key.
 7. Rename ‘ShowIMWindowAlways’ to the new DWORD key.
 8. Set the Key value to1
-9.This keyboard uses the letters aeom to allow IMX input. This time a IM window should display.
+9. This keyboard uses the letters aeom to allow IMX input. This time a IM window should display.
 
 </details>
 
@@ -1607,21 +1247,6 @@ Original TestLodge ID: TC26
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_27**
@@ -1667,21 +1292,6 @@ Original TestLodge ID: TC27
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_28**
@@ -1727,21 +1337,6 @@ Original TestLodge ID: TC28
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_29**
@@ -1789,21 +1384,6 @@ Original TestLodge ID: TC29
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_30**
@@ -1851,21 +1431,6 @@ Original TestLodge ID: TC30
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_31**
@@ -1910,21 +1475,6 @@ Original TestLodge ID: TC31
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_32**
@@ -1969,21 +1519,6 @@ Original TestLodge ID: TC32
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_33**
@@ -2032,21 +1567,6 @@ Original TestLodge ID: TC33
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_34**
@@ -2091,21 +1611,6 @@ Original TestLodge ID: TC34
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_35**
@@ -2141,19 +1646,7 @@ Original TestLodge ID: TC186
 2. Change the directory path to where we downloaded the Keyman Alpha Build.
 3. Type the command : keyman latest version number.exe -o (say “17.0.210.exe -o”).
 4. Verify that the self extract process happened without any errors.
-5.) Verify the build was installed successfully without showing any error messages.
-
-</details>
-
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Click the Control Panel option.
-3. Click the ‘Uninstall a Program’ option.
-4. Select the installed Keyman version from the list.
-5. Click the Uninstall option.
-6. Verify that the keyman uninstallation was completed successfully.
+5. ) Verify the build was installed successfully without showing any error messages.
 
 </details>
 
@@ -2213,21 +1706,6 @@ Original TestLodge ID: TC187
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Task bar)
-2. Verify that the ‘Control panel’ appears in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the the Keyman Uninstallation completed successfully
-
-</details>
-
 ---
 
 **TEST_38**
@@ -2270,21 +1748,6 @@ Original TestLodge ID: TC205
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the Search bar (in Taskbar)
-2. Verify that the ‘Control panel’ appeared in the menu list.
-3. Click the Control panel option.
-4. Verify that the Control Panel dialog appeared.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the Keyman Uninstallation was completed successfully
-
-</details>
-
 ---
 
 **TEST_41**
@@ -2326,14 +1789,6 @@ Original TestLodge ID: TC218
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-2. Uninstall the TextEdit app.
-
-</details>
-
 ---
 
 **TEST_43**
@@ -2376,14 +1831,6 @@ Original TestLodge ID: TC220
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-2. Uninstall the TextEdit app.
-
-</details>
-
 ---
 
 **TEST_46**
@@ -2425,13 +1872,6 @@ Original TestLodge ID: TC232
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-
-</details>
-
 ---
 
 **TEST_48**
@@ -2473,13 +1913,6 @@ Original TestLodge ID: TC234
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-
-</details>
-
 ---
 
 **TEST_51**
@@ -2522,14 +1955,6 @@ Original TestLodge ID: TC246
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-2. Uninstall the TextEdit app.
-
-</details>
-
 ---
 
 **TEST_53**
@@ -2572,14 +1997,6 @@ Original TestLodge ID: TC248
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-2. Uninstall the TextEdit app.
-
-</details>
-
 ---
 
 **TEST_56**
@@ -2622,14 +2039,6 @@ Original TestLodge ID: TC261
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-2. Uninstall the WordPad app.
-
-</details>
-
 ---
 
 **TEST_58**
@@ -2672,14 +2081,6 @@ Original TestLodge ID: TC263
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Uninstall Keyman build on the Windows
-2. Uninstall the WordPad app.
-
-</details>
-
 ---
 
 **TEST_61**
@@ -2733,21 +2134,6 @@ Original TestLodge ID: TC295
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1. Type ‘Control panel’ in the search bar (in the taskbar)
-2. Verify that the ‘Control Panel’ appears in the menu list.
-3. Click the Control Panel option.
-4. Verify that the Control Panel dialog appears.
-5. Click the ‘Uninstall a Program’ option.
-6. Verify that the Programs and Features dialog box opens.
-7. Select the installed Keyman version from the list.
-8. Click the Uninstall option.
-9. Verify that the Keyman Uninstallation was completed successfully.
-
-</details>
-
 ---
 
 **TEST_304**
@@ -2809,21 +2195,6 @@ TC - feat(windows): kmshell switch handling for the installing state_TEST_INSTAL
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1.    Type ‘Control panel’ in the search bar (in the task bar)
-2.    Verify that the ‘Control Panel’ appears in the menu list.
-3.    Click the Control Panel option.
-4.    Verify that the Control Panel dialog appears.
-5.    Click the ‘Uninstall a Program’ option.
-6.    Verify that the Programs and Features dialog box opens.
-7.    Select the installed Keyman version from the list.
-8.    Click the Uninstall option.
-9.    Verify that the Keyman Uninstallation was completed successfully.
-
-</details>
-
 ---
 
 **TEST_309**
@@ -2887,21 +2258,6 @@ TC - fix(windows): handle keyboard package not downloaded #12948
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1.    Type ‘Control panel’ in the search bar (in the task bar)
-2.    Verify that the ‘Control Panel’ appears in the menu list.
-3.    Click the Control Panel option.
-4.    Verify that the Control Panel dialog appears.
-5.    Click the ‘Uninstall a Program’ option.
-6.    Verify that the Programs and Features dialog box opens.
-7.    Select the installed Keyman version from the list.
-8.    Click the Uninstall option.
-9.    Verify that the Keyman Uninstallation was completed successfully.
-
-</details>
-
 ---
 
 **TEST_324**
@@ -2950,17 +2306,3 @@ TC - feat(windows): UI layout for update tab_TEST_UI_UPDATES_KBD #12840
 
 </details>
 
-<details>
-<summary>Cleanup</summary>
-
-1.    Type ‘Control panel’ in the search bar (in the task bar)
-2.    Verify that the ‘Control Panel’ appears in the menu list.
-3.    Click the Control Panel option.
-4.    Verify that the Control Panel dialog appears.
-5.    Click the ‘Uninstall a Program’ option.
-6.    Verify that the Programs and Features dialog box opens.
-7.    Select the installed Keyman version from the list.
-8.    Click the Uninstall option.
-9.    Verify that the Keyman Uninstallation was completed successfully.
-
-</details>