diff --git a/steps/improve/import_payload.sh b/steps/improve/import_payload.sh
index a9577a3b..204027ac 100644
--- a/steps/improve/import_payload.sh
+++ b/steps/improve/import_payload.sh
@@ -7,16 +7,12 @@ set -ex
 
 if match x${PAYLOAD_REQUIRED} xTrue; then
     mkdir -p /dev
-    test -b /dev/sda || mknod -m 600 /dev/sda b 8 0
-    test -b /dev/sdb || mknod -m 600 /dev/sdb b 8 16
-    test -b /dev/sdc || mknod -m 600 /dev/sdc b 8 32
-    test -b /dev/sdd || mknod -m 600 /dev/sdd b 8 48
+    rm -f /dev/sda /dev/sdb /dev/sdc /dev/sdd
+    mknod -m 600 /dev/sda b 8 0
+    mknod -m 600 /dev/sdb b 8 16
+    mknod -m 600 /dev/sdc b 8 32
+    mknod -m 600 /dev/sdd b 8 48
 
     mkdir -p /external/distfiles
-    if test -f /external/distfiles/.payload_imported; then
-        exit 0
-    fi
-
     payload-import /external/distfiles
-    touch /external/distfiles/.payload_imported
 fi
diff --git a/steps/payload-import-1.0/pass1.kaem b/steps/payload-import-1.0/pass1.kaem
index cc982fdb..324e30a3 100644
--- a/steps/payload-import-1.0/pass1.kaem
+++ b/steps/payload-import-1.0/pass1.kaem
@@ -14,8 +14,4 @@ if match x${UPDATE_CHECKSUMS} xTrue; then
         /usr/bin/payload-import
 
     cp ${pkg}.checksums ${SRCDIR}
-else
-    if test -f ${pkg}.checksums; then
-        sha256sum -c ${pkg}.checksums
-    fi
 fi