diff --git a/buildroot-external/board/rpi3/barebox-env/boot/system0 b/buildroot-external/board/rpi3/barebox-env/boot/system0
deleted file mode 100644
index 4239b465c..000000000
--- a/buildroot-external/board/rpi3/barebox-env/boot/system0
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-global bootm.image="/mnt/disk1/boot/bzImage"
-global linux.bootargs.dyn.root="root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
-
diff --git a/buildroot-external/board/rpi3/barebox-env/boot/system1 b/buildroot-external/board/rpi3/barebox-env/boot/system1
deleted file mode 100644
index 3926d4112..000000000
--- a/buildroot-external/board/rpi3/barebox-env/boot/system1
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-global bootm.image="/mnt/disk2/boot/bzImage"
-global linux.bootargs.dyn.root="root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh
index d18277880..4bb672e8a 100644
--- a/buildroot-external/scripts/rootfs-layer.sh
+++ b/buildroot-external/scripts/rootfs-layer.sh
@@ -8,7 +8,6 @@ function fix_rootfs() {
 
     # Cleanup etc
     rm -rf ${TARGET_DIR}/etc/init.d
-    rm -rf ${TARGET_DIR}/etc/modules-load.d
     rm -rf ${TARGET_DIR}/etc/network
     rm -rf ${TARGET_DIR}/etc/X11
     rm -rf ${TARGET_DIR}/etc/xdg