diff --git a/1st-logon.cmd b/1st-logon.cmd
index d7c522f..9a41d7d 100644
--- a/1st-logon.cmd
+++ b/1st-logon.cmd
@@ -2,6 +2,7 @@
 set T=c:\TEMP
 set TOOLS=c:\tools
 set SCRIPTS=c:\scripts
+set FTPSCRIPT=ToolsDownload.ftp
 
 echo ####### %0 #######
 
@@ -25,11 +26,20 @@ mkdir %SCRIPTS%\desktop 1>nul 2>nul
 mkdir %SCRIPTS%\tweaks 1>nul 2>nul
 mkdir %SCRIPTS%\other 1>nul 2>nul
 
-echo opening firewall for FTP access ...
+echo DISABLE firewall (for FTP access) ...
 netsh advfirewall set allprofiles state off
 
 echo getting TOOLS from webserver ...
-ftp -i -s:D:\ToolsDownload.ftp
+rem try to call a script...
+for %%D in (H G F E D) do (
+  if EXIST %%D:\%FTPSCRIPT% (
+    echo EXECUTING ftp-script %FTPSCRIPT% on drive %%D ...
+    ftp -i -s:%%D:\%FTPSCRIPT%
+  ) else (
+    echo INFO: %FTPSCRIPT% not found on drive %%D!
+  )
+
+)
 
 echo ####### %0 #######
 
diff --git a/PrepareStick.cmd b/PrepareStick.cmd
index cbb8ce0..ce79e95 100644
--- a/PrepareStick.cmd
+++ b/PrepareStick.cmd
@@ -20,5 +20,3 @@ copy /Y SetupComplete.ps1 %TARGET%\
 
 echo ####### %0 #######
 
-rem call %TARGET%\%TESTSCRIPT%
-
diff --git a/wimscripts/remove-components.cmd b/wimscripts/remove-components.cmd
index f69b0ec..fe7150d 100644
--- a/wimscripts/remove-components.cmd
+++ b/wimscripts/remove-components.cmd
@@ -82,8 +82,8 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-CoreSystem-DebugTransports"
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Cortana" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DataCenterBridging" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DeviceSync" /r /n
-install_wim_tweak.exe /p %MNT% /c "microsoft-windows-directoryservices-adam" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DirectoryServices-ADAM" /r /n
+rem install_wim_tweak.exe /p %MNT% /c "microsoft-windows-directoryservices-adam" /r /n
+rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DirectoryServices-ADAM" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-EnterpriseClientSync" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-FodMetadata" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Geolocation" /r /n
@@ -92,7 +92,7 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Help" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-HVSI-Components" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-HyperV-OptionalFeature-HypervisorPlatform" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-HyperV-OptionalFeature-VirtualMachinePlatform" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Identity-Foundation" /r /n
+rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Identity-Foundation" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-IIS-WebServer" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-International" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-InternetExplorer" /r /n
@@ -103,7 +103,7 @@ install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-LanguageFeatures" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Legacy" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Links" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Lxss" /r /n
-install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Management-SecureAssessment" /r /n
+rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Management-SecureAssessment" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Format" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayback-OC" /r /n
 install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayer" /r /n
@@ -212,7 +212,7 @@ install_wim_tweak.exe /p %MNT% /c "Multimedia-RestrictedCodecsCore" /r /n
 install_wim_tweak.exe /p %MNT% /c "Multimedia-RestrictedCodecsDolby" /r /n
 install_wim_tweak.exe /p %MNT% /c "MultiPoint-Help" /r /n
 install_wim_tweak.exe /p %MNT% /c "MultiPoint" /r /n
-install_wim_tweak.exe /p %MNT% /c "Networking-MPSSVC-Rules-EnterpriseEdition-Package" /r /n
+rem install_wim_tweak.exe /p %MNT% /c "Networking-MPSSVC-Rules-EnterpriseEdition-Package" /r /n
 install_wim_tweak.exe /p %MNT% /c "OpenSSH-Client-Package" /r /n
 install_wim_tweak.exe /p %MNT% /c "openssh-client-package-Wrapper" /r /n
 install_wim_tweak.exe /p %MNT% /c "RemoteDesktopServices-Base-Package" /r /n