diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd
index 113ac56..2975773 100644
--- a/04_PrepareImage.cmd
+++ b/04_PrepareImage.cmd
@@ -28,7 +28,7 @@ for %%S in (
   mount-image.cmd
 ) do (
   echo ########## calling [ %%S ] ##########
-  call %%S ||  ( cd .. ; exit /b )
+  call %%S || ( cd .. ; exit /b )
   echo.
 )
 
@@ -39,7 +39,7 @@ if /I %ARG1% == /R (
 )
 
 echo ########## calling [ finish-image.cmd ] ##########
-call finish-image.cmd ||  ( cd .. ; exit /b )
+call finish-image.cmd || ( cd .. ; exit /b )
 echo.
 
 rem go back ...
diff --git a/image/autounattend_BIOS_template.xml b/image/autounattend_BIOS_template.xml
index 6c51d95..2daf84b 100644
--- a/image/autounattend_BIOS_template.xml
+++ b/image/autounattend_BIOS_template.xml
@@ -61,10 +61,6 @@
                 </OSImage>
             </ImageInstall>
             <UserData>
-                <ProductKey>
-                    <Key>M7XTQ-FN8P6-TTKYV-9D4CC-J462D</Key>
-                    <WillShowUI>OnError</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <Organization>none</Organization>
             </UserData>
@@ -80,7 +76,6 @@
             <RegisteredOrganization>none</RegisteredOrganization>
             <RegisteredOwner>none</RegisteredOwner>
             <TimeZone>Central Europe Standard Time</TimeZone>
-            <ProductKey>M7XTQ-FN8P6-TTKYV-9D4CC-J462D</ProductKey>
             <ShowPowerButtonOnStartScreen>true</ShowPowerButtonOnStartScreen>
         </component>
     </settings>
diff --git a/image/umount-all.cmd b/image/umount-all.cmd
index be084a0..b077259 100644
--- a/image/umount-all.cmd
+++ b/image/umount-all.cmd
@@ -15,3 +15,4 @@ dism /Cleanup-Mountpoints
 
 echo showing status ...
 dism /Get-MountedWimInfo
+
diff --git a/scripts/autoconfig.cmd b/scripts/autoconfig.cmd
index 905ba67..f0ac306 100644
--- a/scripts/autoconfig.cmd
+++ b/scripts/autoconfig.cmd
@@ -39,7 +39,6 @@ set use_nettime=0
 echo ####### %0 #######
 date /t
 time /t
-echo.
 
 rem ===================
 rem CONFIGFILE CHECKS