diff --git a/src/mainboard/purism/librem_cnl/variants/librem_14/overridetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_14/overridetree.cb
index b3fd862b52..f522e66723 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_14/overridetree.cb
+++ b/src/mainboard/purism/librem_cnl/variants/librem_14/overridetree.cb
@@ -54,21 +54,6 @@ chip soc/intel/cannonlake
 						register "type" = "UPC_TYPE_INTERNAL"
 						device usb 2.2 on end
 					end
-					chip drivers/usb/acpi
-						device usb 2.3 off end
-					end
-					chip drivers/usb/acpi
-						device usb 2.4 off end
-					end
-					chip drivers/usb/acpi
-						device usb 2.5 off end
-					end
-					chip drivers/usb/acpi
-						register "desc" = ""Left Type-A Port""
-						register "type" = "UPC_TYPE_A"
-						register "group" = "ACPI_PLD_GROUP(1, 0)"
-						device usb 2.6 off end
-					end
 					chip drivers/usb/acpi
 						register "desc" = ""Right Type-C Port""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
@@ -81,9 +66,6 @@ chip soc/intel/cannonlake
 						register "group" = "ACPI_PLD_GROUP(1, 1)"
 						device usb 2.8 on end
 					end
-					chip drivers/usb/acpi
-						device usb 2.9 off end
-					end
 					chip drivers/usb/acpi
 						register "desc" = ""Right Type-A Port""
 						register "type" = "UPC_TYPE_A"
@@ -96,15 +78,6 @@ chip soc/intel/cannonlake
 						register "group" = "ACPI_PLD_GROUP(1, 0)"
 						device usb 3.1 on end
 					end
-					chip drivers/usb/acpi
-						register "desc" = ""Right Type-C Port""
-						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
-						register "group" = "ACPI_PLD_GROUP(0, 1)"
-						device usb 3.2 off end
-					end
-					chip drivers/usb/acpi
-						device usb 3.3 off end
-					end
 					chip drivers/usb/acpi
 						register "desc" = ""Left Type-C Port""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
@@ -131,7 +104,6 @@ chip soc/intel/cannonlake
 			register "usb3_ports[4]" = "USB3_PORT_DEFAULT(OC2)"	# Type-C left
 			register "usb3_ports[5]" = "USB3_PORT_DEFAULT(OC_SKIP)"	# Card Reader
 		end
-		device ref xdci off end
 		device ref i2c0 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""HTIX5288""
diff --git a/src/mainboard/purism/librem_cnl/variants/librem_mini/overridetree.cb b/src/mainboard/purism/librem_cnl/variants/librem_mini/overridetree.cb
index f9baef2bf4..d2f1a835c6 100644
--- a/src/mainboard/purism/librem_cnl/variants/librem_mini/overridetree.cb
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/overridetree.cb
@@ -59,15 +59,6 @@ chip soc/intel/cannonlake
 						register "group" = "ACPI_PLD_GROUP(1, 2)"
 						device usb 2.5 on end
 					end
-					chip drivers/usb/acpi
-						device usb 2.6 off end
-					end
-					chip drivers/usb/acpi
-						device usb 2.7 off end
-					end
-					chip drivers/usb/acpi
-						device usb 2.8 off end
-					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB2 Type-A Rear Lower""
 						register "type" = "UPC_TYPE_A"
@@ -86,9 +77,6 @@ chip soc/intel/cannonlake
 						register "group" = "ACPI_PLD_GROUP(0, 1)"
 						device usb 3.1 on end
 					end
-					chip drivers/usb/acpi
-						device usb 3.2 off end
-					end
 					chip drivers/usb/acpi
 						register "desc" = ""USB3 Type-C Rear""
 						register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"