diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
index c34ed5c5..0002895b 100644
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -106,8 +106,6 @@ ipq40xx_setup_interfaces()
 			"0u@eth0" "3:lan:2" "4:lan:1"
 		ucidef_set_interface_wan "eth1"
 		;;
-	netgear,rbr50|\
-	netgear,rbs50|\
 	netgear,srr60|\
 	netgear,srs60)
 		ucidef_add_switch "switch0" \
diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 74d24f33..de85839d 100644
--- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -46,8 +46,6 @@ case "$FIRMWARE" in
 		# OEM assigns 4 sequential MACs
 		ath10k_patch_mac $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4))
 		;;
-	netgear,rbr50|\
-	netgear,rbs50|\
 	netgear,srr60|\
 	netgear,srs60)
 		caldata_extract_mmc "0:ART" 0x9000 0x2f20
@@ -161,8 +159,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary dnidata 0x0)
 		;;
-	netgear,rbr50|\
-	netgear,rbs50|\
 	netgear,srr60|\
 	netgear,srs60)
 		caldata_extract_mmc "0:ART" 0x1000 0x2f20
@@ -287,8 +283,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary dnidata 0xc)
 		;;
-	netgear,rbr50|\
-	netgear,rbs50|\
 	netgear,srr60|\
 	netgear,srs60)
 		caldata_extract_mmc "0:ART" 0x5000 0x2f20
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 9952d5da..6b9e831f 100644
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -120,8 +120,6 @@ platform_do_upgrade() {
 		[ "$(rootfs_type)" = "tmpfs" ] && mtd erase firmware
 		default_do_upgrade "$1"
 		;;
-	netgear,rbr50 |\
-	netgear,rbs50 |\
 	netgear,srr60 |\
 	netgear,srs60)
 		platform_do_upgrade_netgear_orbi_upgrade "$1"
diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index 8c258f40..64ec5917 100644
--- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,66 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,65 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -57,8 +57,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4019-e2600ac-c2.dtb \
 +	qcom-ipq4019-habanero-dvk.dtb \
 +	qcom-ipq4019-pa2200.dtb \
-+	qcom-ipq4019-rbr50.dtb \
-+	qcom-ipq4019-rbs50.dtb \
 +	qcom-ipq4019-rtl30vw.dtb \
 +	qcom-ipq4019-srr60.dtb \
 +	qcom-ipq4019-srs60.dtb \