diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk
index 22776849ef..c7b97d8085 100644
--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@@ -62,6 +62,10 @@ makeinstall_target() {
     done < ${fwlist}
   done
 
+  # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead
+  rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.bin
+  rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.bin
+
   # Cleanup - which may be project or device specific
   find_file_path scripts/cleanup.sh && ${FOUND_PATH} ${FW_TARGET_DIR} || true
 }
diff --git a/projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat b/projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/projects/RPi/packages/kernel-firmware/scripts/cleanup.sh b/projects/RPi/packages/kernel-firmware/scripts/cleanup.sh
deleted file mode 100755
index 8b0348706f..0000000000
--- a/projects/RPi/packages/kernel-firmware/scripts/cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-FW_TARGET_DIR=$1
-
-# The following files will be installed by brcmfmac_sdio-firmware-rpi instead
-rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.bin
-rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.bin
-
-exit 0