diff --git a/build-scripts/20-xenclient-oe.layer b/build-scripts/20-xenclient-oe.layer
index 9c6216657..5f64c4891 100644
--- a/build-scripts/20-xenclient-oe.layer
+++ b/build-scripts/20-xenclient-oe.layer
@@ -12,7 +12,6 @@ openxt_layer_xenclient_oe_images=(                                          \
 "xenclient-dom0         xenclient-initramfs                 cpio.gz"        \
 "xenclient-dom0         xenclient-dom0                      ext3.gz"     \
 "openxt-installer       xenclient-installer                 cpio.gz"     \
-"openxt-installer       xenclient-installer-part2           tar.bz2"     \
 "xenclient-uivm         xenclient-uivm                      ext3.vhd.gz" \
 "xenclient-ndvm         xenclient-ndvm                      ext3.disk.vhd.gz" \
 )
diff --git a/build-scripts/oe/build.sh b/build-scripts/oe/build.sh
index 2e41e765d..865ecca7b 100755
--- a/build-scripts/oe/build.sh
+++ b/build-scripts/oe/build.sh
@@ -108,8 +108,9 @@ build_image() {
 
     # Transfer image and give it the expected name
     if [ -f ${SOURCE_IMAGE} ]; then
-        if [ "$IMAGE_NAME" = "xenclient-installer-part2" ]; then
-            $RSYNC ${SOURCE_IMAGE} ${TARGET}/raw/control.${EXTENSION}
+        if [ "$IMAGE_NAME" = "xenclient-installer" ]; then
+            $RSYNC tmp-glibc/deploy/images/${MACHINE}/control.tar.bz2 \
+                   ${TARGET}/raw/control.tar.bz2
             $RSYNC tmp-glibc/deploy/images/${MACHINE}/*.acm \
                    tmp-glibc/deploy/images/${MACHINE}/tboot.gz \
                    tmp-glibc/deploy/images/${MACHINE}/xen.gz \
@@ -120,9 +121,8 @@ build_image() {
             fi
             $RSYNC tmp-glibc/deploy/images/${MACHINE}/bzImage-${MACHINE}.bin \
                    ${TARGET}/netboot/vmlinuz
-        else
-            $RSYNC ${SOURCE_IMAGE} ${TARGET}/raw/${REAL_NAME}-rootfs.${EXTENSION}
         fi
+        $RSYNC ${SOURCE_IMAGE} ${TARGET}/raw/${REAL_NAME}-rootfs.${EXTENSION}
     fi
 
     # Transfer licenses
diff --git a/do_build.sh b/do_build.sh
index 7913622be..b155b42bb 100755
--- a/do_build.sh
+++ b/do_build.sh
@@ -1,7 +1,7 @@
 #! /bin/bash -e
 set -o pipefail
 
-STEPS="setupoe,initramfs,stubinitramfs,dom0,uivm,ndvm,syncvm,installer,installer2,syncui,source,sdk,license,sourceinfo,ship"
+STEPS="setupoe,initramfs,stubinitramfs,dom0,uivm,ndvm,syncvm,installer,syncui,source,sdk,license,sourceinfo,ship"
 
 # Additional steps:
 
@@ -398,6 +398,7 @@ do_oe_installer_copy()
         cp "$binaries/$machine/grub-efi-bootx64.efi" \
                 "$OUTPUT_DIR/$NAME/raw/grubx64.efi"
         cp "$binaries/$machine/isohdpfx.bin" "$OUTPUT_DIR/$NAME/raw/"
+        cp "$binaries/$machine/control.tar.bz2" "$OUTPUT_DIR/$NAME/raw/"
 
         popd
 }
@@ -410,28 +411,6 @@ do_oe_installer()
         do_oe_installer_copy $path "openxt-installer"
 }
 
-do_oe_installer_part2_copy()
-{
-        local path="$1"
-        local machine="$2"
-        local binaries="tmp-glibc/deploy/images"
-        pushd "$path"
-
-        mkdir -p "$OUTPUT_DIR/$NAME/raw"
-
-        cp "$binaries/$machine/xenclient-installer-part2-image-openxt-installer.tar.bz2" "$OUTPUT_DIR/$NAME/raw/control.tar.bz2"
-
-        popd
-}
-
-do_oe_installer_part2()
-{
-        local path="$1"
-
-        do_oe "$path" "openxt-installer" "xenclient-installer-part2-image"
-        do_oe_installer_part2_copy $path "openxt-installer"
-}
-
 do_oe_source_shrink()
 {
         local path="$1"
@@ -1369,10 +1348,6 @@ do_build()
                                 do_oe_installer "$path" ;;
                         installercp)
                                 do_oe_installer_copy "$path" "openxt-installer";;
-                        installer2)
-                                do_oe_installer_part2 "$path" ;;
-                        installer2cp)
-                                do_oe_installer_part2_copy "$path" "xenclient-dom0";;
                         license*)
                                 do_oe_copy_licenses "$path" ;;
                         sourceinfo*)