diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index 231fdca..ea6e9bd 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -6,9 +6,11 @@
 
 Set $MsiId32$ = '{A6EE99EA-420C-4FA6-8A7C-FDB60D278855}'
 Set $UninstallProgram32$ = $InstallDir32$ + "\" + $uVersion$ + "\uninstall.exe"
+Set $RealUninstallProgram32$ = $InstallDir32$ + "\" + $uVersion$ + "\immunet-uninstall.exe"
 
 Set $MsiId64$ = '{XXXXXXXX-XXXX-XXXX-XXXXXXXXXXXXXXXXX}'
 Set $UninstallProgram32$ = $InstallDir64$ + "\" + $uVersion$ + "\uninstall.exe"
+Set $RealUninstallProgram32$ = $InstallDir64$ + "\" + $uVersion$ + "\immunet-uninstall.exe"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
 	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
@@ -18,18 +20,14 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
+		Dosbatch_uninstall_32
 		sub_check_exitcode
-		Winbatch_please_wait_32
-		sub_check_exitcode
-		ExitWindows /ImmediateReboot
 	endif
 
 	if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
 		comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
 		Winbatch_uninstall_msi_32
 		sub_check_exitcode
-		ExitWindows /ImmediateReboot
 	endif
 	
 	comment "Delete files"
@@ -46,9 +44,7 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
-		sub_check_exitcode
-		Winbatch_please_wait_64
+		Dosbatch_uninstall_64
 		sub_check_exitcode
 	endif
 
@@ -72,17 +68,13 @@ LinkFolder_uninstall
 net stop immunetprotect
 taskkill /IM iptray.exe
 
-[Winbatch_please_wait_32]
-"%ScriptPath%\please-wait.exe"
-
-[Winbatch_please_wait_64]
-"%ScriptPath%\please-wait.exe"
-
-[Winbatch_uninstall_32]
+[Dosbatch_uninstall_32]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"$UninstallProgram32$" /S
+;"$UninstallProgram32$" /S
+cd $InstallDir32$\$uVersion$
+"$RealUninstallProgram32$"
 
 
 [Winbatch_uninstall_msi_32]
@@ -93,11 +85,13 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 ;
 delete -sf "$InstallDir32$\"
 
-[Winbatch_uninstall_64]
+[Dosbatch_uninstall_64]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"$UninstallProgram64$" /S
+;"$UninstallProgram64$" /S
+cd $InstallDir64$\$uVersion$
+"$RealUninstallProgram64$"
 
 
 [Winbatch_uninstall_msi_64]
diff --git a/CLIENT_DATA/please-wait.exe b/CLIENT_DATA/immunet-uninstall.exe
similarity index 99%
rename from CLIENT_DATA/please-wait.exe
rename to CLIENT_DATA/immunet-uninstall.exe
index 5cbb5f8..5768052 100644
Binary files a/CLIENT_DATA/please-wait.exe and b/CLIENT_DATA/immunet-uninstall.exe differ
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 30adfb9..c8cba73 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -524,6 +524,7 @@ xml ed -O -u "/config/ui/notification/cloud" -v $ui_notification_cloud$ $Install
 ; Example of recursively copying some files into the installation directory:
 ;
 copy -s "%ScriptPath%\*.xml" "$InstallDir32$"
+copy -s "%ScriptPath%\immunet-uninstall.exe" "$InstallDir32$\$uVersion$"
 
 [Winbatch_install_64]
 ; Choose one of the following examples as basis for your installation
@@ -537,6 +538,7 @@ copy -s "%ScriptPath%\*.xml" "$InstallDir32$"
 ; Example of recursively copying some files into the installation directory:
 ;
 copy -s "%ScriptPath%\*.xml" "$InstallDir64$"
+copy -s "%ScriptPath%\immunet-uninstall.exe" "$InstallDir64$\$uVersion$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/immunet-uninstall.au3 b/immunet-uninstall.au3
index d567e2a..a448c1b 100644
Binary files a/immunet-uninstall.au3 and b/immunet-uninstall.au3 differ
diff --git a/please-wait.au3 b/please-wait.au3
deleted file mode 100644
index 41cc9c3..0000000
--- a/please-wait.au3
+++ /dev/null
@@ -1,20 +0,0 @@
-#cs ----------------------------------------------------------------------------
-
- AutoIt Version: 3.3.8.1
- Author:         myName
-
- Script Function:
-	Template AutoIt script.
-
-#ce ----------------------------------------------------------------------------
-
-; Script Start - Add your code below here
-
-ProgressOn("Immunet Uninstall", "Progress", "0 %")
-For $i = 1 to 100 step 1
-   sleep(1200)
-   ProgressSet($i, $i & " %")
-Next
-ProgressSet(100, "", "Done")
-Sleep(500)
-ProgressOff()
\ No newline at end of file