diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index f96ab68..44a5ebd 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -71,8 +71,6 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
-		Winbatch_extract_32
-		Sub_check_exitcode
 		Winbatch_install_32
 		Sub_check_exitcode
 		comment "Copy files"
@@ -87,8 +85,6 @@ else
 		Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
-		Winbatch_extract_64
-		Sub_check_exitcode
 		Winbatch_install_64
 		Sub_check_exitcode
 		comment "Copy files"
@@ -101,11 +97,9 @@ else
 	
 endif
 
-[Winbatch_extract_32]
-"$Install32Exe$" /extract:"$LogDir$"
-
 [Winbatch_install_32]
-msiexec /i "$LogDir$\$Extract32Dir\tccle.msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
+; 2 spaces between /qb and /l otherwise the extractor failes
+"$Install32Exe$" /qb  /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
@@ -115,11 +109,9 @@ copy "$IniCfgFile$" "$InstallDir32$"
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
-[Winbatch_extract_64]
-"$Install64Exe$" /extract:"$LogDir$"
-
 [Winbatch_install_64]
-msiexec /i "$LogDir$\$Extract64Dir\tcclex64.msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
+; 2 spaces between /qb and /l otherwise the extractor failes
+"$Install64Exe$" /qb  /l* "$LogDir$\$ProductId$.install_log.txt" ALLUSERS=1 REBOOT=ReallySuppress
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
diff --git a/builder-product.cfg b/builder-product.cfg
index 4b6bbaf..b6d39ca 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -1,7 +1,7 @@
 ############################
 # Setup product information 
 ############################
-VENDOR="http://jpsoft.com/"
+VENDOR="jpsoft.com"
 PN="jpsoft.tccle"
 NAME="TCC/LE Shell"
 DESCRIPTION="TCC/LE is our free Windows command shell (formerly known as 4NT)."
@@ -31,18 +31,6 @@ DL_WINST_NAME[2]=Install64Exe
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
-WINST_NAME[0]="Extract32Dir"
-WINST_VALUE[0]="3C97621"
-
-WINST_NAME[1]="Extract64Dir"
-WINST_VALUE[1]="6BA2265"
-
-WINST_NAME[2]="TccLe32Dir"
-WINST_VALUE[2]="6BA2265"
-
-WINST_NAME[3]="TccLe64Dir"
-WINST_VALUE[3]="6BA2265"
-
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="MsiId32"
 OPSI_INI_VALUE[0]="{CF67BC8F-42C3-40E7-A2E1-DD87A3C97621}"