diff --git a/CustomSetup.cmd b/CustomSetup.cmd
index dd08619..885bc12 100644
--- a/CustomSetup.cmd
+++ b/CustomSetup.cmd
@@ -42,6 +42,10 @@ echo unpacking ImapCopy ...
 %TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\ImapCopy.zip
 del /F %TOOLS%\ImapCopy.zip 1>nul 2>nul
 
+echo unpacking MediaCreationTool ...
+%TOOLS%\7z x -aoa -o%TOOLS% %TOOLS%\MediaCreationTool20H2.zip
+del /F %TOOLS%\MediaCreationTool20H2.zip 1>nul 2>nul
+
 echo installing GIT ...
 call install-git.cmd
 
diff --git a/wim/remove-components.cmd b/wim/remove-components.cmd
index 8218a3d..036f67a 100644
--- a/wim/remove-components.cmd
+++ b/wim/remove-components.cmd
@@ -82,12 +82,6 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MobilePC" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MRT10" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MSMQ" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MultiPoint-Connector" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetFx2-OC-Package" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetFx3-OC-Package" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetFx3-OnDemand-Package" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetFx3-WCF-OC-Package" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetFx4-US-OC-Package" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetFx4-WCF-US-OC-Package" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Network-Connectivity-Assistant" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetworkDiagnostics" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Network-QoS" /r /n