diff --git a/packer/vhd-image-builder.json b/packer/vhd-image-builder.json
index 41c5ab220..b21cbc619 100644
--- a/packer/vhd-image-builder.json
+++ b/packer/vhd-image-builder.json
@@ -67,7 +67,7 @@
             "inline": [
                 "sudo BUILD_NUMBER={{user `build_number`}} BUILD_ID={{user `build_id`}} COMMIT={{user `commit`}} /bin/bash -ux /home/packer/install-dependencies.sh",
                 "sudo /bin/bash -eux /home/packer/cleanup-vhd.sh",
-                "rm /home/packer/*.sh"
+                "rm -rf /home/packer"
             ]
         }
     ]
diff --git a/parts/k8s/kubernetescustomscript.sh b/parts/k8s/kubernetescustomscript.sh
index 3a402e460..b7d0f8df5 100755
--- a/parts/k8s/kubernetescustomscript.sh
+++ b/parts/k8s/kubernetescustomscript.sh
@@ -26,6 +26,7 @@ fi
 if [ -f /var/log/azure/golden-image-install.complete ]; then
     echo "detected golden image pre-install"
     FULL_INSTALL_REQUIRED=false
+    rm -rf /home/packer
 else
     FULL_INSTALL_REQUIRED=true
 fi
diff --git a/parts/k8s/kubernetesinstalls.sh b/parts/k8s/kubernetesinstalls.sh
index 102a6c99f..d6d81c862 100755
--- a/parts/k8s/kubernetesinstalls.sh
+++ b/parts/k8s/kubernetesinstalls.sh
@@ -195,12 +195,12 @@ function pullHyperkube() {
     path=$(find /home/rootfs-${KUBERNETES_VERSION} -name "hyperkube")
 
     if [[ $OS == $COREOS_OS_NAME ]]; then
-        cp "$path" "/opt/kubelet"
-        cp "$path" "/opt/kubectl"
+        mv "$path" "/opt/kubelet"
+        mv "$path" "/opt/kubectl"
         chmod a+x /opt/kubelet /opt/kubectl
     else
-        cp "$path" "/usr/local/bin/kubelet-${KUBERNETES_VERSION}"
-        cp "$path" "/usr/local/bin/kubectl-${KUBERNETES_VERSION}"
+        mv "$path" "/usr/local/bin/kubelet-${KUBERNETES_VERSION}"
+        mv "$path" "/usr/local/bin/kubectl-${KUBERNETES_VERSION}"
     fi
 }
 
@@ -213,6 +213,7 @@ function extractHyperkube() {
     mv "/usr/local/bin/kubectl-${KUBERNETES_VERSION}" "/usr/local/bin/kubectl"
     chmod a+x /usr/local/bin/kubelet /usr/local/bin/kubectl
     rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
+    rm -rf /home/rootfs-*
 }
 
 function pullContainerImage() {