diff --git a/server/commandlinetools.xml.in b/server/commandlinetools.xml.in
index b53fcf30..2587017e 100755
--- a/server/commandlinetools.xml.in
+++ b/server/commandlinetools.xml.in
@@ -39,51 +39,6 @@
                 </compareText>
             </ruleList>
         </folder>
-        <!-- LINUX_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-x64</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/commandlinetools/lib</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/commandlinetools/bin</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/commandlinetools/share</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/commandlinetools/installer</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/commandlinetools/scripts</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>staging/linux-x64/commandlinetools/commandlinetools_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <!-- LINUX_PPC64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-ppc64</name>
-            <platforms>linux-ppc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/linux-ppc64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
         <!-- MAC: Program files -->
         <folder>
             <description>Program Files</description>
@@ -135,42 +90,6 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
-        <!-- SOLARIS_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-x64</name>
-            <platforms>solaris-intel</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-x64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <!-- SOLARIS_SPARC: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-sparc</name>
-            <platforms>solaris-sparc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-sparc/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
     </folderList>
     <!-- WIN: Start Menu -->
     <startMenuShortcutList>
@@ -233,8 +152,6 @@
             <type>regexp</type>
             <substitutionList>
                 <substitution pattern="Cflags:.*include" value="Cflags: -I${installdir}/include"/>
-            </substitutionList>
-            <substitutionList>
                 <substitution pattern="Libs:.*lib" value="Libs: -L${installdir}/lib"/>
             </substitutionList>
             <ruleList>
diff --git a/server/installer.xml.in b/server/installer.xml.in
index 43a08b37..87f3517c 100755
--- a/server/installer.xml.in
+++ b/server/installer.xml.in
@@ -729,8 +729,6 @@ EOF
     </initializationActionList>
 
 
-    <readyToInstallActionList/>
-
     <installationAbortedActionList>
         <deleteFile path="${system_temp_directory}/postgresql_installer_${random_number}" abortOnError="0" showMessageOnError="0">
             <ruleList>
@@ -1252,21 +1250,6 @@ EOF
                 <isFalse value="${extract_mode}"/>
             </ruleList>
         </unpackFile>
-        <unpackFile>
-            <component>default</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
-            <folder>defaultlinux-x64</folder>
-            <origin>prerun_checks.sh</origin>
-            <customErrorMessage>${msg(error.writing.temp)}</customErrorMessage>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>linux-x64</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
         <unpackFile>
             <component>default</component>
             <destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
@@ -1282,34 +1265,6 @@ EOF
                 <isFalse value="${extract_mode}"/>
             </ruleList>
         </unpackFile>
-        <unpackFile>
-            <component>default</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
-            <folder>programfilessolaris-x64</folder>
-            <origin>server/installer/prerun_checks.sh</origin>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>solaris-intel</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
-        <unpackFile>
-            <component>default</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}</destination>
-            <folder>programfilessolaris-sparc</folder>
-            <origin>server/installer/prerun_checks.sh</origin>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>solaris-sparc</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
 
          <actionGroup>
             <actionList>
@@ -2070,28 +2025,6 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
                         </compareText>
                     </ruleList>
                 </folder>
-                <!-- LINUX-X64: files for default component -->
-                <folder>
-                    <description>Program Files</description>
-                    <destination>${installdir}/installer/server</destination>
-                    <name>defaultlinux-x64</name>
-                    <platforms>linux-x64</platforms>
-                    <distributionFileList>
-                        <distributionDirectory>
-                            <origin>staging/linux-x64/server/installer/prerun_checks.sh</origin>
-                        </distributionDirectory>
-                        <distributionDirectory>
-                            <origin>staging/linux-x64/server/scripts</origin>
-                        </distributionDirectory>
-                    </distributionFileList>
-                    <ruleList>
-                        <compareText>
-                            <logic>contains</logic>
-                            <text>${platform_name}</text>
-                            <value>linux-x64</value>
-                        </compareText>
-                    </ruleList>
-                </folder>
                 <!-- MacOSX: files for default component -->
                 <folder>
                     <description>Program Files</description>
@@ -2136,7 +2069,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
                 <folder>
                     <description>Program Files</description>
                     <destination>${installdir}/installer</destination>
-                    <name>defaultwindows-x64</name>
+                    <name>defaultwindows64</name>
                     <platforms>windows</platforms>
                     <distributionFileList>
                         <distributionDirectory>
@@ -2266,15 +2199,6 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
             <cliOptionName>prefix</cliOptionName>
             <width>30</width>
             <mustBeWritable>yes</mustBeWritable>
-            <ruleList>
-                <stringTest>
-                    <text>${iBaseDirectory}</text>
-                    <type>empty</type>
-                </stringTest>
-            </ruleList>
-            <postShowPageActionList>
-                <wow64FsRedirection action="disable" />
-            </postShowPageActionList>
 
             <validationActionList>
                 <validateInstallDir  installdir="${installdir}">
@@ -2285,6 +2209,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
             </validationActionList>
 
             <postShowPageActionList>
+                <wow64FsRedirection action="disable" />
                 <actionGroup>
                     <actionList>
                         <actionGroup>
@@ -2340,6 +2265,10 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
             </postShowPageActionList>
             <ruleList>
                    <isTrue  value="${component(server).selected}"/>
+                   <stringTest>
+                       <text>${iBaseDirectory}</text>
+                       <type>empty</type>
+                   </stringTest>
             </ruleList>
         </directoryParameter>
 
@@ -2385,16 +2314,6 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
             <cliOptionName>datadir</cliOptionName>
             <width>30</width>
             <mustBeWritable>yes</mustBeWritable>
-            <ruleList>
-                <stringTest>
-                    <text>${iDataDirectory}</text>
-                    <type>empty</type>
-                </stringTest>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-            <postShowPageActionList>
-                <wow64FsRedirection action="disable" />
-            </postShowPageActionList>
 
             <!-- Check the directory selected. If it's a valid data directory, change to upgrade mode -->
 
@@ -2402,6 +2321,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
             <!-- to some odd behaviour in InstallBuilder in the way <allowEmptyValue> -->
             <!-- interacts with default values, on the advice of tech support         -->
             <postShowPageActionList>
+                <wow64FsRedirection action="disable" />
                 <!-- !WIN: Always check if the data directory path looks valid and is writeable -->
                 <actionGroup>
                     <!-- We need this because this isn't a validateActionList> -->
@@ -2722,9 +2642,8 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
                                 </compareText>
                             </ruleList>
                         </actionGroup>
-                    </actionList>
-                    <!-- Switch to upgrade mode -->
-                    <actionList>
+
+                        <!-- Switch to upgrade mode -->
                         <setInstallerVariable>
                             <name>IsUpgrade</name>
                             <value>1</value>
@@ -2744,7 +2663,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
                             <pattern>^.*port\s*=\s*([\d]+)\s+.*$</pattern>
                             <substitution>\1</substitution>
                         </setInstallerVariableFromRegEx>
-                     </actionList>
+                    </actionList>
 
                      <!-- We only check the data directory if it exists and isn't empty -->
                      <ruleList>
@@ -2791,6 +2710,11 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
                 </actionGroup>
             </postShowPageActionList>
             <ruleList>
+                <stringTest>
+                    <text>${iDataDirectory}</text>
+                    <type>empty</type>
+                </stringTest>
+                <isFalse value="${extract_mode}"/>
                 <isTrue  value="${component(server).selected}"/>
             </ruleList>
         </directoryParameter>
@@ -3288,8 +3212,7 @@ ${dbsummary}${cltsummary}${pgadminsummary}${sbsummary}${msg(summary.installation
                 <isTrue  value="${component(server).selected}"/> 
             </ruleList>
         </parameterGroup>
-    </parameterList>
-    <parameterList>
+
         <infoParameter>
             <name>preinstallsummary</name>
             <title>${msg(preinstall.summary)}</title>
diff --git a/server/pgadmin.xml.in b/server/pgadmin.xml.in
index 8d087391..03ec3eb4 100755
--- a/server/pgadmin.xml.in
+++ b/server/pgadmin.xml.in
@@ -51,85 +51,6 @@
                 </compareText>
             </ruleList>
         </folder>
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}/server/scripts</destination>
-            <name>scriptfileslinux_2</name>
-            <platforms>linux4</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux/pgadmin4/scripts/xdg</origin>
-                </distributionDirectory>
-            </distributionFileList>
-            <ruleList>
-                <compareText>
-                    <logic>does_not_equal</logic>
-                    <text>${platform_name}</text>
-                    <value>linux-x64</value>
-                </compareText>
-            </ruleList>
-        </folder>
-        <!-- LINUX_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-x64</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/pgadmin4/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>staging/linux-x64/pgadmin4/pgAdmin_3rd_party_licenses.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/linux-x64/pgadmin4/pgAdmin_license.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <folder>
-            <description>Script Files</description>
-            <destination>${installdir}</destination>
-            <name>scriptfileslinux-x64</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/pgadmin4/scripts</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/pgadmin4/installer</origin>
-                </distributionDirectory>
-            </distributionFileList>
-        </folder>
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}/server/scripts</destination>
-            <name>scriptfileslinux-x64_2</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/pgadmin4/scripts/xdg</origin>
-                </distributionDirectory>
-            </distributionFileList>
-        </folder>
-        <!-- LINUX_PPC64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-ppc64</name>
-            <platforms>linux-ppc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/linux-ppc64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
         <!-- MAC: Program files -->
         <folder>
             <description>Program Files</description>
@@ -175,42 +96,6 @@
                 </distributionFile>
             </distributionFileList>
 </folder>
-        <!-- SOLARIS_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-x64</name>
-            <platforms>solaris-intel</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-x64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <!-- SOLARIS_SPARC: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-sparc</name>
-            <platforms>solaris-sparc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/pgAdmin 4</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-sparc/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
     </folderList>
     <componentSelectionValidationActionList>
         <throwError>
diff --git a/server/pgserver.xml.in b/server/pgserver.xml.in
index 5aba0083..73c2cc2a 100755
--- a/server/pgserver.xml.in
+++ b/server/pgserver.xml.in
@@ -46,75 +46,6 @@
                 </compareText>
             </ruleList>
         </folder>
-        <!-- LINUX_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-x64</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/bin</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/doc</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/include</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/installer</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/scripts</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/share</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/server/etc</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>staging/linux-x64/server/server_license.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <!-- LINUX_PPC64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-ppc64</name>
-            <platforms>linux-ppc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/bin</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/doc</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/include</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/installer</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/lib</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/scripts</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/share</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/linux-ppc64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
         <!-- MAC: Program files -->
         <folder>
             <description>Program Files</description>
@@ -181,81 +112,7 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
-        <!-- SOLARIS_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-x64</name>
-            <platforms>solaris-intel</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/bin</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/doc</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/include</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/installer</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/lib</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/scripts</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/share</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-x64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
         <!-- SOLARIS_SPARC: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-sparc</name>
-            <platforms>solaris-sparc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/bin</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/doc</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/include</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/installer</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/lib</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/scripts</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/stackbuilder</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/share</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-sparc/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
     </folderList>
     <componentSelectionValidationActionList>
         <throwError>
@@ -1442,34 +1299,6 @@
                 <isFalse value="${extract_mode}"/>
             </ruleList>
         </unpackFile>
-        <unpackFile>
-            <component>server</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}/getlocales</destination>
-            <folder>programfileslinux-x64</folder>
-            <origin>installer/server/getlocales</origin>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>linux-x64</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
-        <unpackFile>
-            <component>server</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}/getlocales</destination>
-            <folder>programfileslinux-ppc64</folder>
-            <origin>installer/server/getlocales</origin>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>linux-ppc</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
         <unpackFile>
             <component>server</component>
             <destination>${system_temp_directory}/postgresql_installer_${random_number}/getlocales.exe</destination>
@@ -1484,34 +1313,6 @@
                 <isFalse value="${extract_mode}"/>
             </ruleList>
         </unpackFile>
-        <unpackFile>
-            <component>server</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}/getlocales</destination>
-            <folder>programfilessolaris-x64</folder>
-            <origin>installer/server/getlocales</origin>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>solaris-intel</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
-        <unpackFile>
-            <component>server</component>
-            <destination>${system_temp_directory}/postgresql_installer_${random_number}/getlocales</destination>
-            <folder>programfilessolaris-sparc</folder>
-            <origin>installer/server/getlocales</origin>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>solaris-sparc</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </unpackFile>
 
         <!-- pg_controldata (used to check existing clusters) -->
         <actionGroup>
@@ -1558,124 +1359,6 @@
             </ruleList>
         </actionGroup>
 
-        <actionGroup>
-            <actionList>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/pg_controldata</destination>
-                    <folder>programfileslinux-x64</folder>
-                    <origin>bin/pg_controldata</origin>
-                </unpackFile>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/runpgcontroldata.sh</destination>
-                    <folder>programfileslinux-x64</folder>
-                    <origin>installer/server/runpgcontroldata.sh</origin>
-                </unpackFile>
-            </actionList>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>linux-x64</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </actionGroup>
-
-        <actionGroup>
-            <actionList>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/pg_controldata</destination>
-                    <folder>programfileslinux-ppc64</folder>
-                    <origin>bin/pg_controldata</origin>
-                </unpackFile>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/runpgcontroldata.sh</destination>
-                    <folder>programfileslinux-ppc64</folder>
-                    <origin>installer/server/runpgcontroldata.sh</origin>
-                </unpackFile>
-                <unpackDirectory>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/</destination>
-                    <folder>programfileslinux-ppc64</folder>
-                    <origin>lib</origin>
-                </unpackDirectory>
-            </actionList>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>linux-ppc</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </actionGroup>
-
-        <actionGroup>
-            <actionList>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/pg_controldata</destination>
-                    <folder>programfilessolaris-x64</folder>
-                    <origin>bin/pg_controldata</origin>
-                </unpackFile>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/runpgcontroldata.sh</destination>
-                    <folder>programfilessolaris-x64</folder>
-                    <origin>installer/server/runpgcontroldata.sh</origin>
-                </unpackFile>
-                <unpackDirectory>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/</destination>
-                    <folder>programfilessolaris-x64</folder>
-                    <origin>lib</origin>
-                </unpackDirectory>
-            </actionList>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>solaris-intel</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </actionGroup>
-
-        <actionGroup>
-            <actionList>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/pg_controldata</destination>
-                    <folder>programfilessolaris-sparc</folder>
-                    <origin>bin/pg_controldata</origin>
-                </unpackFile>
-                <unpackFile>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/runpgcontroldata.sh</destination>
-                    <folder>programfilessolaris-sparc</folder>
-                    <origin>installer/server/runpgcontroldata.sh</origin>
-                </unpackFile>
-                <unpackDirectory>
-                    <component>server</component>
-                    <destination>${system_temp_directory}/postgresql_installer_${random_number}/</destination>
-                    <folder>programfilessolaris-sparc</folder>
-                    <origin>lib</origin>
-                </unpackDirectory>
-            </actionList>
-            <ruleList>
-                <compareText>
-                    <logic>equals</logic>
-                    <text>${platform_name}</text>
-                    <value>solaris-sparc</value>
-                </compareText>
-                <isFalse value="${extract_mode}"/>
-            </ruleList>
-        </actionGroup>
-
         <actionGroup>
             <actionList>
                 <unpackFile>
@@ -1742,7 +1425,7 @@
                 <unpackFile>
                     <component>default</component>
                     <destination>${system_temp_directory}\postgresql_installer_${random_number}\vcredist_x64.exe</destination>
-                    <folder>defaultwindows-x64</folder>
+                    <folder>defaultwindows64</folder>
                     <origin>vcredist_x64.exe</origin>
                     <ruleList>
                         <compareValues value1="@@WINDIR@@" value2="windows-x64" logic="equals"/>
diff --git a/server/stackbuilder.xml.in b/server/stackbuilder.xml.in
index c13e3634..7ec5861b 100755
--- a/server/stackbuilder.xml.in
+++ b/server/stackbuilder.xml.in
@@ -91,82 +91,6 @@
                 </compareText>
             </ruleList>
         </folder>
-        <!-- LINUX_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-x64</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/stackbuilder/scripts</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>staging/linux-x64/stackbuilder/StackBuilder_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}/stackbuilder</destination>
-            <name>programfileslinux-x64_1</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/stackbuilder/bin</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/stackbuilder/lib</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>staging/linux-x64/stackbuilder/share</origin>
-                </distributionDirectory>
-            </distributionFileList>
-        </folder>
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}/stackbuilder/installer</destination>
-            <name>programfileslinux-x64_2</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionDirectory allowWildcards="1">
-                    <excludeFiles>*/server</excludeFiles>
-                    <origin>staging/linux-x64/stackbuilder/installer/*</origin>
-                </distributionDirectory>
-            </distributionFileList>
-        </folder>
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}/installer/server</destination>
-            <name>programfileslinux-x64_3</name>
-            <platforms>linux-x64</platforms>
-            <distributionFileList>
-                <distributionFile>
-                    <origin>staging/linux-x64/stackbuilder/installer/server/createshortcuts_sb.sh</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/linux-x64/stackbuilder/installer/server/removeshortcuts_sb.sh</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <!-- LINUX_PPC64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfileslinux-ppc64</name>
-            <platforms>linux-ppc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/linux-ppc64/stackbuilder</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/linux-ppc64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
         <!-- MAC: Program files -->
         <folder>
             <description>Program Files</description>
@@ -209,43 +133,7 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
-        <!-- SOLARIS_X64: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-x64</name>
-            <platforms>solaris-intel</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-x64/stackbuilder</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-x64/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-        <!-- SOLARIS_SPARC: Program files -->
-        <folder>
-            <description>Program Files</description>
-            <destination>${installdir}</destination>
-            <name>programfilessolaris-sparc</name>
-            <platforms>solaris-sparc</platforms>
-            <distributionFileList>
-                <distributionDirectory>
-                    <origin>staging/solaris-sparc/stackbuilder</origin>
-                </distributionDirectory>
-                <distributionFile>
-                    <origin>../resources/license.txt</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>staging/solaris-sparc/server_3rd_party_licenses.txt</origin>
-                </distributionFile>
-            </distributionFileList>
-        </folder>
-    </folderList>
+   </folderList>
 
     <!-- WIN: Start Menu -->
     <startMenuShortcutList>