diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index 8dd2ad1..d271279 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -5,10 +5,10 @@
 
 
 Set $MsiId32$ = '{XXXXXXXX-XXXX-XXXX-XXXXXXXXXXXXXXXXX}'
-Set $UninstallProgram32$ = $InstallDir32$ + "\" + $uVersion$ + "\immunet-uninstall.exe"
+Set $UninstallProgram32$ = $InstallDir32$ + "\" + $uVersion$ + "\uninstall.exe"
 
 Set $MsiId64$ = '{XXXXXXXX-XXXX-XXXX-XXXXXXXXXXXXXXXXX}'
-Set $UninstallProgram32$ = $InstallDir64$ + "\" + $uVersion$ + "\immunet-uninstall.exe"
+Set $UninstallProgram32$ = $InstallDir64$ + "\" + $uVersion$ + "\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,7 +18,7 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
 
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
-		Dosbatch_uninstall_32
+		Winbatch_uninstall_32
 		sub_check_exitcode
 	endif
 
@@ -42,7 +42,7 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
 
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
-		Dosbatch_uninstall_64
+		Winbatch_uninstall_64
 		sub_check_exitcode
 	endif
 
@@ -66,14 +66,11 @@ LinkFolder_uninstall
 net stop immunetprotect
 taskkill /IM iptray.exe
 
-[Dosbatch_uninstall_32]
+[Winbatch_uninstall_32]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-;"$UninstallProgram32$" /S
-;"$UninstallProgram32$"
-cd $InstallDir32$"\"$uVersion$
-immunet-uninstall.exe
+"$UninstallProgram32$" /S
 
 
 [Winbatch_uninstall_msi_32]
@@ -84,14 +81,11 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 ;
 delete -sf "$InstallDir32$\"
 
-[Dosbatch_uninstall_64]
+[Winbatch_uninstall_64]
 ; Choose one of the following examples as basis for program uninstall
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-;"$UninstallProgram64$" /S
-;"$UninstallProgram64$"
-cd $InstallDir32$"\"$uVersion$
-immunet-uninstall.exe
+"$UninstallProgram64$" /S
 
 
 [Winbatch_uninstall_msi_64]
diff --git a/CLIENT_DATA/immunet-uninstall.exe b/CLIENT_DATA/immunet-uninstall.exe
deleted file mode 100644
index bcc4df6..0000000
Binary files a/CLIENT_DATA/immunet-uninstall.exe and /dev/null differ
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 19d1d6b..30adfb9 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -524,7 +524,6 @@ 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%\*.exe" "$InstallDir32$\$uVersion$"
 
 [Winbatch_install_64]
 ; Choose one of the following examples as basis for your installation
@@ -538,7 +537,6 @@ copy -s "%ScriptPath%\*.exe" "$InstallDir32$\$uVersion$"
 ; 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: