From abd16d181d80a402255d9d49031bbb6416a9d831 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 25 Dec 2022 20:52:46 +0100
Subject: [PATCH] switch from shitty installwimtweak to commercial NTLite tool
---
03_MakeBoot.cmd | 43 ++++++
04_PrepareImage.cmd | 54 +++++++
03_MakeAll.cmd => 05_FinishImage.cmd | 15 +-
04_FormatStick.cmd => 06_FormatStick.cmd | 0
05_PrepareStick.cmd => 07_PrepareStick.cmd | 18 +--
06_Copy2Stick.cmd => 08_CopyWIM2Stick.cmd | 2 +-
07_MakeIso.cmd => 09_MakeISOfromStick.cmd | 0
scripts/uninstall-pchealth.cmd | 22 +++
software/basic.csv | 1 -
wim/apps-to-remove.csv | 37 -----
wim/export-image.cmd | 28 ----
wim/finish-image.cmd | 24 +--
wim/get-wiminfo.cmd | 2 +-
wim/mount-image.cmd | 3 +-
wim/netuse.cmd | 3 +-
wim/packages-to-remove.csv | 164 ---------------------
wim/remove-apps.cmd | 19 ---
wim/remove-packages.cmd | 37 -----
wim/umount-all.cmd | 1 +
19 files changed, 132 insertions(+), 341 deletions(-)
create mode 100644 03_MakeBoot.cmd
create mode 100644 04_PrepareImage.cmd
rename 03_MakeAll.cmd => 05_FinishImage.cmd (61%)
rename 04_FormatStick.cmd => 06_FormatStick.cmd (100%)
rename 05_PrepareStick.cmd => 07_PrepareStick.cmd (59%)
rename 06_Copy2Stick.cmd => 08_CopyWIM2Stick.cmd (95%)
rename 07_MakeIso.cmd => 09_MakeISOfromStick.cmd (100%)
create mode 100644 scripts/uninstall-pchealth.cmd
delete mode 100644 wim/apps-to-remove.csv
delete mode 100644 wim/packages-to-remove.csv
delete mode 100644 wim/remove-apps.cmd
delete mode 100644 wim/remove-packages.cmd
diff --git a/03_MakeBoot.cmd b/03_MakeBoot.cmd
new file mode 100644
index 0000000..edba0b2
--- /dev/null
+++ b/03_MakeBoot.cmd
@@ -0,0 +1,43 @@
+@echo off
+
+rem check for wim script directory ...
+if NOT EXIST wim (
+ echo ERROR: script directory [ wim ] NOT FOUND!
+ echo ABORT.
+ exit /b
+) else (
+ cd wim
+)
+
+clear
+echo =========================================
+echo START of BOOT image creation process ...
+echo =========================================
+date /t
+time /t
+echo.
+
+rem start scripts
+for %%S in (
+
+ mount-boot.cmd
+ finish-boot.cmd
+
+) do (
+
+ echo ########## calling [ %%S ] ##########
+ call %%S
+ echo.
+
+)
+
+rem go back ...
+cd ..
+
+echo.
+date /t
+time /t
+echo ======
+echo READY.
+echo ======
+
diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd
new file mode 100644
index 0000000..2caea61
--- /dev/null
+++ b/04_PrepareImage.cmd
@@ -0,0 +1,54 @@
+@echo off
+
+rem check for wim script directory ...
+if NOT EXIST wim (
+ echo ERROR: script directory [ wim ] NOT FOUND!
+ echo ABORT.
+ exit /b
+) else (
+ cd wim
+)
+
+clear
+echo =========================================
+echo START of MAIN image preparation ...
+echo =========================================
+date /t
+time /t
+echo.
+
+rem start scripts
+for %%S in (
+
+ export-image.cmd
+ mount-image.cmd
+
+) do (
+
+ echo ########## calling [ %%S ] ##########
+ call %%S
+ echo.
+
+)
+
+rem go back ...
+cd ..
+
+echo checking for NTLite ...
+if NOT EXIST %NTLITE% (
+ echo.
+ echo ERROR: program [ NTLite ] NOT FOUND!
+ exit /b
+) else (
+ echo calling NTLite ...
+ rem stupid windows: the "" are needed or NTlite will not be started - sigh -
+ start /B "" %NTLITE%
+)
+
+echo.
+date /t
+time /t
+echo ======
+echo READY.
+echo ======
+
diff --git a/03_MakeAll.cmd b/05_FinishImage.cmd
similarity index 61%
rename from 03_MakeAll.cmd
rename to 05_FinishImage.cmd
index e5016ae..ca96948 100644
--- a/03_MakeAll.cmd
+++ b/05_FinishImage.cmd
@@ -10,26 +10,17 @@ if NOT EXIST wim (
)
clear
-echo ===================================
-echo START of image creation process ...
-echo ===================================
+echo =========================================
+echo END of MAIN image preparation ...
+echo =========================================
date /t
time /t
echo.
-echo cleanup ...
-del /F Apps*.txt 2>nul
-del /F Packages*.txt 2>nul
-
rem start scripts
for %%S in (
- mount-boot.cmd
- finish-boot.cmd
-
- export-image.cmd
mount-image.cmd
- remove-apps.cmd
finish-image.cmd
) do (
diff --git a/04_FormatStick.cmd b/06_FormatStick.cmd
similarity index 100%
rename from 04_FormatStick.cmd
rename to 06_FormatStick.cmd
diff --git a/05_PrepareStick.cmd b/07_PrepareStick.cmd
similarity index 59%
rename from 05_PrepareStick.cmd
rename to 07_PrepareStick.cmd
index 1cb1f3f..be3b7d0 100644
--- a/05_PrepareStick.cmd
+++ b/07_PrepareStick.cmd
@@ -37,22 +37,8 @@ echo using image %ISOFILE% ...
echo mounting disk image (iso) with powershell ...
powershell Mount-DiskImage -ImagePath %ISOFILE%
-set answer=
-:askyes
- set /p answer="copy windows image (WIM) files (Y/N)? "
- if /i "%answer:~,1%" EQU "Y" (
- echo copying files from image to targetpath %USBDRIVE% ...
- robocopy \\.\CDROM0 %USBDRIVE% /MIR /256 /NFL /NDL /R:10
- GOTO CONT
- )
- if /i "%answer:~,1%" EQU "N" (
- echo copying files from image to targetpath %USBDRIVE% ...
- robocopy \\.\CDROM0 %USBDRIVE% /MIR /256 /NFL /NDL /R:10 /XF *.wim /XF *.esd
- goto CONT
- )
- echo Please type Y or N.
- goto askyes
-:CONT
+echo copying files from image to targetpath %USBDRIVE% ...
+robocopy \\.\CDROM0 %USBDRIVE% /MIR /256 /NFL /NDL /R:10 /XF *.wim
echo unmounting disk image (iso) ...
powershell Dismount-Diskimage -ImagePath %ISOFILE%
diff --git a/06_Copy2Stick.cmd b/08_CopyWIM2Stick.cmd
similarity index 95%
rename from 06_Copy2Stick.cmd
rename to 08_CopyWIM2Stick.cmd
index b706a63..a455492 100644
--- a/06_Copy2Stick.cmd
+++ b/08_CopyWIM2Stick.cmd
@@ -1,7 +1,7 @@
@echo off
set SOURCES=c:\TEMP\W10\sources
set BOOT=boot.wim
-set IMAGE=install.esd
+set IMAGE=install.wim
set SCRIPT_SETTINGS=scripts\settings.cmd
set COMPANY_SETTINGS=company\settings.cmd
diff --git a/07_MakeIso.cmd b/09_MakeISOfromStick.cmd
similarity index 100%
rename from 07_MakeIso.cmd
rename to 09_MakeISOfromStick.cmd
diff --git a/scripts/uninstall-pchealth.cmd b/scripts/uninstall-pchealth.cmd
new file mode 100644
index 0000000..43660ec
--- /dev/null
+++ b/scripts/uninstall-pchealth.cmd
@@ -0,0 +1,22 @@
+@echo off
+
+echo ####### %0 #######
+
+echo KILLING PC health check ...
+taskkill /f /im PCHealthCheck.exe > NUL 2>&1
+
+echo DELETING PC health check folder ...
+rd "%ProgramFiles%\PCHealthCheck" /Q /S > NUL 2>&1
+
+echo remove PC health check from application list ...
+reg DELETE "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B1FCD52-8F6B-4F12-A143-361EA39F5E7C}" /f > NUL 2>&1
+
+echo removing PC health check registry keys ...
+reg DELETE "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHealthCheck" /f > NUL 2>&1
+reg DELETE "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHC" /f > NUL 2>&1
+
+echo removing link in Start menu ...
+del /F "%ProgramData%\Microsoft\Windows\Start Menu\Programs\PC Health Check.lnk"
+
+echo ####### %0 #######
+
diff --git a/software/basic.csv b/software/basic.csv
index 9a84449..9a21de2 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -4,7 +4,6 @@ https://download.sysinternals.com/files/SysinternalsSuite.zip sysinternals.zip
https://curl.se/windows/dl-7.79.1/curl-7.79.1-win64-mingw.zip curl.zip
https://github.com/git-for-windows/git/releases/download/v2.30.1.windows.1/Git-2.30.1-64-bit.exe git-setup.exe
http://www.ardiehl.de/imapcopy/IMAPCopy.zip imapcopy.zip
-https://www.deskmodder.de/blog/wp-content/uploads/2018/06/install-wim-tweak.zip installwimtweak.zip
https://go.microsoft.com/fwlink/?LinkId=691209 MediaCreationTool20H2.exe
https://www.nirsoft.net/utils/offlineregistryfinder-x64.zip offlineregistryfinder.zip
https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.160/OpenShellSetup_4_4_160.exe openshell-setup.exe
diff --git a/wim/apps-to-remove.csv b/wim/apps-to-remove.csv
deleted file mode 100644
index 51b2fcf..0000000
--- a/wim/apps-to-remove.csv
+++ /dev/null
@@ -1,37 +0,0 @@
-549981C3F5F10_1.1911.21713.0_neutral_~_8wekyb3d8bbwe
-BingWeather_4.25.20211.0_neutral_~_8wekyb3d8bbwe
-DesktopAppInstaller_2019.125.2243.0_neutral_~_8wekyb3d8bbwe
-GetHelp_10.1706.13331.0_neutral_~_8wekyb3d8bbwe
-Getstarted_8.2.22942.0_neutral_~_8wekyb3d8bbwe
-HEIFImageExtension_1.0.22742.0_x64__8wekyb3d8bbwe
-Microsoft3DViewer_6.1908.2042.0_neutral_~_8wekyb3d8bbwe
-MicrosoftEdge.Stable_84.0.522.52_neutral__8wekyb3d8bbwe
-MicrosoftOfficeHub_18.1903.1152.0_neutral_~_8wekyb3d8bbwe
-MicrosoftSolitaireCollection_4.4.8204.0_neutral_~_8wekyb3d8bbwe
-MicrosoftStickyNotes_3.6.73.0_neutral_~_8wekyb3d8bbwe
-MixedReality.Portal_2000.19081.1301.0_neutral_~_8wekyb3d8bbwe
-MSPaint_2019.729.2301.0_neutral_~_8wekyb3d8bbwe
-Office.OneNote_16001.12026.20112.0_neutral_~_8wekyb3d8bbwe
-People_2019.305.632.0_neutral_~_8wekyb3d8bbwe
-ScreenSketch_2019.904.1644.0_neutral_~_8wekyb3d8bbwe
-SkypeApp_14.53.77.0_neutral_~_kzf8qxf38zg5c
-VP9VideoExtensions_1.0.22681.0_x64__8wekyb3d8bbwe
-Wallet_2.4.18324.0_neutral_~_8wekyb3d8bbwe
-WebMediaExtensions_1.0.20875.0_neutral_~_8wekyb3d8bbwe
-WebpImageExtension_1.0.22753.0_x64__8wekyb3d8bbwe
-Windows.Photos_2019.19071.12548.0_neutral_~_8wekyb3d8bbwe
-WindowsAlarms_2019.807.41.0_neutral_~_8wekyb3d8bbwe
-WindowsCamera_2018.826.98.0_neutral_~_8wekyb3d8bbwe
-windowscommunicationsapps_16005.11629.20316.0_neutral_~_8wekyb3d8bbwe
-WindowsFeedbackHub_2019.1111.2029.0_neutral_~_8wekyb3d8bbwe
-WindowsMaps_2019.716.2316.0_neutral_~_8wekyb3d8bbwe
-WindowsSoundRecorder_2019.716.2313.0_neutral_~_8wekyb3d8bbwe
-Xbox.TCUI_1.23.28002.0_neutral_~_8wekyb3d8bbwe
-XboxApp_48.49.31001.0_neutral_~_8wekyb3d8bbwe
-XboxGameOverlay_1.46.11001.0_neutral_~_8wekyb3d8bbwe
-XboxGamingOverlay_2.34.28001.0_neutral_~_8wekyb3d8bbwe
-XboxIdentityProvider_12.50.6001.0_neutral_~_8wekyb3d8bbwe
-XboxSpeechToTextOverlay_1.17.29001.0_neutral_~_8wekyb3d8bbwe
-YourPhone_2019.430.2026.0_neutral_~_8wekyb3d8bbwe
-ZuneMusic_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
-ZuneVideo_2019.19071.19011.0_neutral_~_8wekyb3d8bbwe
diff --git a/wim/export-image.cmd b/wim/export-image.cmd
index 117cd67..346603c 100644
--- a/wim/export-image.cmd
+++ b/wim/export-image.cmd
@@ -1,6 +1,5 @@
@echo off
set SOURCES=c:\TEMP\W10\sources
-set ESD=%SOURCES%\install.esd
set WIM=%SOURCES%\install.wim
set W10PRO=%SOURCES%\w10pro.wim
set STATEFILE=%SOURCES%\w10pro.txt
@@ -15,33 +14,6 @@ if EXIST %STATEFILE% (
)
-if EXIST %ESD% (
-
- echo.
- echo [%0] INFO: found %ESD%
-
- echo [%0] INFO: deleting %WIM% ...
- del %WIM% 2>nul
-
- echo [%0] INFO: exporting image from %ESD% ...
- dism /Export-Image ^
- /SourceImageFile:%ESD% ^
- /DestinationImageFile:%WIM% ^
- /SourceName:"Windows 10 Pro" ^
- /Compress:Max ^
- /CheckIntegrity
-
- if %ERRORLEVEL% NEQ 0 (
- echo [%0] ERROR: while extracting %ESD%
- exit /b
- )
-
- echo.
- echo READY.
- exit /b
-
-)
-
if EXIST %WIM% (
rem cleanup ...
diff --git a/wim/finish-image.cmd b/wim/finish-image.cmd
index 1aae351..e27bbc9 100644
--- a/wim/finish-image.cmd
+++ b/wim/finish-image.cmd
@@ -1,9 +1,7 @@
@echo off
set IMAGE=c:\TEMP\IMAGE
set SOURCES=c:\TEMP\W10\sources
-set ESD=%SOURCES%\install.esd
set WIM=%SOURCES%\install.wim
-set TEMPFILE=%SOURCES%\temp.esd
if NOT EXIST %WIM% (
echo.
@@ -25,7 +23,7 @@ if %ERRORLEVEL% NEQ 0 (
)
echo [%0] INFO: showing directory contents :
-dir %IMAGE%\Windows\Setup\scripts
+dir %IMAGE%\Windows\Setup\scripts %IMAGE%\Windows\prompt-user.exe
echo [%0] INFO: doing cleanup on mountpoint %IMAGE% ...
dism /Image:%IMAGE% /Cleanup-Image /StartComponentCleanup /ResetBase
@@ -33,23 +31,3 @@ dism /Image:%IMAGE% /Cleanup-Image /StartComponentCleanup /ResetBase
echo [%0] INFO: unmounting and committing changes to %WIM% ...
dism /Unmount-Wim /MountDir:%IMAGE% /Commit
-echo [%0] INFO: directory of %IMAGE% :
-dir %IMAGE%
-
-echo [%0] INFO: exporting %WIM% to %TEMPFILE% ...
-dism /Export-Image ^
- /SourceImageFile:%WIM% ^
- /DestinationImageFile:%TEMPFILE% ^
- /SourceName:"Windows 10 Pro" ^
- /Compress:Recovery ^
- /CheckIntegrity
-
-echo [%0] INFO: renaming new esd file to %ESD% ...
-move /Y %TEMPFILE% %ESD%
-
-rem delete wim file only in case there is an esd file ...
-if EXIST %ESD% (
- echo [%0] INFO: deleting %WIM%
- del /F %SOURCES%\install.wim 2>nul
-)
-
diff --git a/wim/get-wiminfo.cmd b/wim/get-wiminfo.cmd
index a7ec889..4eaf875 100644
--- a/wim/get-wiminfo.cmd
+++ b/wim/get-wiminfo.cmd
@@ -12,7 +12,7 @@ GOTO END
echo "usage: %0 <FILENAME>"
echo.
-dir /B %SOURCES%\*.esd %SOURCES%\*.wim
+dir /B %SOURCES%\*.wim
echo.
:END
diff --git a/wim/mount-image.cmd b/wim/mount-image.cmd
index a6e1458..8f660dd 100644
--- a/wim/mount-image.cmd
+++ b/wim/mount-image.cmd
@@ -1,6 +1,7 @@
@echo off
set SOURCES=c:\TEMP\W10\sources
set IMAGE=c:\TEMP\IMAGE
+set NTLITE="%ProgramFiles%\NTLite\NTLite.exe"
echo creating image mountpoint ...
mkdir %IMAGE% 1>nul 2>nul
@@ -8,6 +9,6 @@ mkdir %IMAGE% 1>nul 2>nul
rem set write access ...
attrib -R %SOURCES%\install.wim 2>nul
-echo mounting install.IMAGE to %IMAGE% ...
+echo mounting install.wim to %IMAGE% ...
dism /Mount-IMAGE /IMAGEFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%IMAGE%
diff --git a/wim/netuse.cmd b/wim/netuse.cmd
index a2e67f7..82831e8 100644
--- a/wim/netuse.cmd
+++ b/wim/netuse.cmd
@@ -27,4 +27,5 @@ net use %DRIVE%: /DELETE 1>nul 2>nul
net use %DRIVE%: \\%SERVER%\%SHARE% /USER:%USER% %PASSWORD%
echo READY.
-echo.
\ No newline at end of file
+echo.
+
diff --git a/wim/packages-to-remove.csv b/wim/packages-to-remove.csv
deleted file mode 100644
index 1bada07..0000000
--- a/wim/packages-to-remove.csv
+++ /dev/null
@@ -1,164 +0,0 @@
-Adobe-Flash
-Containers-ApplicationGuard
-Containers-Client
-Containers-DisposableClientVM
-Containers-Guest-Gated
-Containers-OptionalFeature
-Containers-Server
-DeviceAccess
-HyperV
-LanguageFeatures-WordBreaking
-Media-FaceAnalysis
-Media-Ocr
-Microsoft-Composable-PlatformExtension
-Microsoft-Hyper-V
-Microsoft-IoTUAP-ShellExt-Tools
-Microsoft-Mobile
-Microsoft-PPIProjection
-Microsoft-UtilityVM
-Microsoft-Windows-3DAudio
-Microsoft-Windows-ApiSetSchemaExtension-HyperV
-Microsoft-Windows-AppCompat
-Microsoft-Windows-AppManagement
-Microsoft-Windows-AppServerClient
-Microsoft-Windows-Backup
-Microsoft-Windows-Basic-Http-Minio
-Microsoft-Windows-BioEnrollment
-Microsoft-Windows-BITS
-Microsoft-Windows-Browser
-Microsoft-Windows-BusinessScanning
-Microsoft-Windows-Casting
-Microsoft-Windows-Client-AssignedAccess
-Microsoft-Windows-Client-EmbeddedExp
-Microsoft-Windows-Client-Optional-Features
-Microsoft-Windows-Client-ShellLauncher
-Microsoft-Windows-Common-Modem
-Microsoft-Windows-COM-MSMQ
-Microsoft-Windows-Compression
-Microsoft-Windows-ContactSupport
-Microsoft-Windows-ContentDeliveryManager
-Microsoft-Windows-CoreSystem-DebugTransports
-Microsoft-Windows-Cortana
-Microsoft-Windows-DataCenterBridging
-Microsoft-Windows-DeviceSync
-Microsoft-Windows-DirectoryServices
-Microsoft-Windows-EnterpriseClientSync
-Microsoft-Windows-FodMetadata
-Microsoft-Windows-Geolocation
-Microsoft-Windows-Hello-Face
-Microsoft-Windows-Help
-Microsoft-Windows-HVSI-Components
-Microsoft-Windows-HyperV-OptionalFeature-HypervisorPlatform
-Microsoft-Windows-HyperV-OptionalFeature-VirtualMachinePlatform
-Microsoft-Windows-Identity-Foundation
-Microsoft-Windows-IIS-WebServer
-Microsoft-Windows-International
-Microsoft-Windows-InternetExplorer
-Microsoft-Windows-Internet
-Microsoft-Windows-Killbits
-Microsoft-Windows-LanguageEnablingComponents
-Microsoft-Windows-LanguageFeatures
-Microsoft-Windows-Legacy
-Microsoft-Windows-Links
-Microsoft-Windows-Lxss
-Microsoft-Windows-Management-SecureAssessment
-Microsoft-Windows-Migration
-Microsoft-Windows-MiracastView
-Microsoft-Windows-MobileBroadband
-Microsoft-Windows-MobileCore
-Microsoft-Windows-MobilePC
-Microsoft-Windows-MRT10
-Microsoft-Windows-MSMQ
-Microsoft-Windows-MultiPoint-Connector
-Microsoft-Windows-Network-Connectivity-Assistant
-Microsoft-Windows-NetworkDiagnostics
-Microsoft-Windows-Network-QoS
-Microsoft-Windows-NFS
-Microsoft-Windows-Not-Supported-On-LTSB
-Microsoft-Windows-OfflineFiles
-Microsoft-Windows-OneCore-Containers
-Microsoft-Windows-OneDrive
-Microsoft-Windows-ParentalControls
-Microsoft-Windows-PAW-Feature
-Microsoft-Windows-PeerDist
-Microsoft-Windows-PeerToPeer
-Microsoft-Windows-PerformanceCounters
-Microsoft-Windows-PhotoBasic
-Microsoft-Windows-Printing-InternetPrinting-Client
-Microsoft-Windows-Printing-LocalPrinting-Enterprise
-Microsoft-Windows-Printing-PremiumTools
-Microsoft-Windows-Printing-PrintToPDFServices
-microsoft-windows-printing-wfs-fod-package-Wrapper
-Microsoft-Windows-Printing-WFS-FoD-Package
-Microsoft-Windows-Printing-XPSServices
-Microsoft-Windows-Provisioning
-Microsoft-Windows-Proximity
-Microsoft-Windows-QuickAssist
-Microsoft-Windows-RDC
-Microsoft-Windows-RemoteAssistance
-Microsoft-Windows-RemoteDesktop
-Microsoft-Windows-RemoteFX
-Microsoft-Windows-RetailDemo
-Microsoft-Windows-Search2
-Microsoft-Windows-SearchEngine
-Microsoft-Windows-SenseClient
-Microsoft-Windows-Serial
-Microsoft-Windows-ShareMedia
-Microsoft-Windows-Shell-HomeGroup
-Microsoft-Windows-Shell-SettingSync
-Microsoft-Windows-Skype
-Microsoft-Windows-SMB1Client-D
-Microsoft-Windows-SMB1Deprecation-Group
-Microsoft-Windows-SMB1
-Microsoft-Windows-SMB1Server-D-Opt
-Microsoft-Windows-SmbDirect-Opt
-Microsoft-Windows-SmbDirect
-Microsoft-Windows-SNMP
-Microsoft-Windows-StorageService
-Microsoft-Windows-Store
-Microsoft-Windows-SystemRestore
-Microsoft-Windows-TabletPC
-Microsoft-Windows-TabletPCMath
-microsoft-windows-tabletpcmath-package-Wrapper
-Microsoft-Windows-TabShellExperience
-Microsoft-Windows-TerminalServices
-Microsoft-Windows-TextPrediction-Dictionaries
-Microsoft-Windows-TextPrediction
-Microsoft-Windows-TroubleShooting
-Microsoft-Windows-TS
-Microsoft-Windows-UpdateTargeting-ClientOS
-Microsoft-Windows-UserExperience
-microsoft-windows-userexperience-desktop-package-Wrapper
-Microsoft-Windows-Virtualization-RemoteFX-User-Mode-Transport
-Microsoft-Windows-Virtualization
-Microsoft-Windows-VirtualPC
-Microsoft-Windows-VirtualXP
-Microsoft-Windows-WebcamExperience
-Microsoft-Windows-WindowsFoundation-LanguagePack
-Microsoft-Windows-WinOcr
-Microsoft-Windows-WinRT
-Microsoft-Windows-WinSATMediaFiles
-Microsoft-Windows-WMIPerf
-Microsoft-Windows-WordBreaking
-Microsoft-Windows-WorkplaceJoin
-Microsoft-Windows-Xps
-Microsoft-Xbox
-MSMQ-Driver-Package
-MultiPoint
-Networking-MPSSVC-Rules-EnterpriseEdition-Package
-OpenSSH-Client-Package
-openssh-client-package-Wrapper
-RemoteDesktopServices
-Sensors-Universal
-Server-Help
-Windows-Defender
-WindowsSearchEngineSKU-Group
-Microsoft-OneCore-Multimedia-CastingCommon
-Microsoft-OneCore-Multimedia-CastingReceiver
-Microsoft-OneCore-Multimedia-CastingTransmitter
-Microsoft-OneCore-DeviceUpdateCenter
-Microsoft-OneCore-DirectX-Database
-Microsoft-OneCore-IsolatedUserMode
-Microsoft-Onecore-SPP-VirtualDevice
-Microsoft-OneCore-VirtualizationBasedSecurity
-Microsoft-Windows-WMPNetworkSharingService
diff --git a/wim/remove-apps.cmd b/wim/remove-apps.cmd
deleted file mode 100644
index 224a465..0000000
--- a/wim/remove-apps.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-set IMAGE=c:\TEMP\IMAGE
-
-echo exporting APPS list BEFORE doing any changes ...
-dism /Image:%IMAGE% /Get-ProvisionedAppxPackages 1>Apps-BEFORE.txt
-
-FOR /F %%P in (apps-to-remove.csv) do (
-
- echo removing APPX package [ Microsoft.%%P ]
- dism /Image:%IMAGE% /Remove-ProvisionedAppxPackage /PackageName:Microsoft.%%P
-
-)
-
-echo exporting remaining APPS list ...
-dism /Image:%IMAGE% /Get-ProvisionedAppxPackages 1>Apps-AFTER.txt
-
-rem showing packages ...
-dir Apps*.txt
-
diff --git a/wim/remove-packages.cmd b/wim/remove-packages.cmd
deleted file mode 100644
index 30a5b71..0000000
--- a/wim/remove-packages.cmd
+++ /dev/null
@@ -1,37 +0,0 @@
-@echo off
-set IMAGE=c:\TEMP\IMAGE
-
-rem the CHECKFILE is a file that will be monitored against deletion ...
-set CHECKFILE=%IMAGE%\Windows\SysWOW64\mf.dll
-
-echo exporting PACKAGE list BEFORE doing any changes ...
-install_wim_tweak /p %IMAGE% /l
-move /Y Packages.txt Packages-BEFORE.txt
-
-rem ###################################
-rem MAIN loop ( remove packages ) ...
-rem ###################################
-
-FOR /F %%P in (packages-to-remove.csv) do (
-
- echo removing PACKAGE [ %%P ] ...
- install_wim_tweak.exe /p %IMAGE% /c "%%P" /r /n
-
- rem we will exit here in case the checkfile was deleted by a package removal ...
- if NOT EXIST %CHECKFILE% (
- echo ERROR: File %CHECKFILE% was deleted
- exit /b
- )
-
-)
-
-echo CLEANUP ...
-del /F SOFTWAREBKP 1>nul 2>nul
-
-echo exporting remaining PACKAGES list ...
-install_wim_tweak /p %IMAGE% /l
-move /Y Packages.txt Packages-AFTER.txt
-
-rem showing package files ...
-dir Packages*.txt
-
diff --git a/wim/umount-all.cmd b/wim/umount-all.cmd
index 5d2fbb5..101076e 100644
--- a/wim/umount-all.cmd
+++ b/wim/umount-all.cmd
@@ -5,6 +5,7 @@ set BOOT=c:\TEMP\BOOT
echo unmounting image and discarding changes ...
dism /Unmount-Wim /MountDir:%IMAGE% /Discard
+echo.
echo unmounting boot and discarding changes ...
dism /Unmount-Wim /MountDir:%BOOT% /Discard