diff --git a/src/mainboard/starlabs/byte_adl/mainboard.c b/src/mainboard/starlabs/byte_adl/mainboard.c
index 60e65ee8c4..cd46529c0f 100644
--- a/src/mainboard/starlabs/byte_adl/mainboard.c
+++ b/src/mainboard/starlabs/byte_adl/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <device/device.h>
 #include <soc/ramstage.h>
-#include <option.h>
 #include <variants.h>
 
 static void init_mainboard(void *chip_info)
@@ -12,8 +11,6 @@ static void init_mainboard(void *chip_info)
 
 	pads = variant_gpio_table(&num);
 	gpio_configure_pads(pads, num);
-
-	devtree_update();
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/starlabs/lite/mainboard.c b/src/mainboard/starlabs/lite/mainboard.c
index 04537094d0..cd46529c0f 100644
--- a/src/mainboard/starlabs/lite/mainboard.c
+++ b/src/mainboard/starlabs/lite/mainboard.c
@@ -11,8 +11,6 @@ static void init_mainboard(void *chip_info)
 
 	pads = variant_gpio_table(&num);
 	gpio_configure_pads(pads, num);
-
-	devtree_update();
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/starlabs/starbook/mainboard.c b/src/mainboard/starlabs/starbook/mainboard.c
index 772e32cc1c..f392ed8759 100644
--- a/src/mainboard/starlabs/starbook/mainboard.c
+++ b/src/mainboard/starlabs/starbook/mainboard.c
@@ -13,8 +13,6 @@ static void init_mainboard(void *chip_info)
 
 	pads = variant_gpio_table(&num);
 	gpio_configure_pads(pads, num);
-
-	devtree_update();
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/starlabs/starfighter/mainboard.c b/src/mainboard/starlabs/starfighter/mainboard.c
index 60e65ee8c4..cd46529c0f 100644
--- a/src/mainboard/starlabs/starfighter/mainboard.c
+++ b/src/mainboard/starlabs/starfighter/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <device/device.h>
 #include <soc/ramstage.h>
-#include <option.h>
 #include <variants.h>
 
 static void init_mainboard(void *chip_info)
@@ -12,8 +11,6 @@ static void init_mainboard(void *chip_info)
 
 	pads = variant_gpio_table(&num);
 	gpio_configure_pads(pads, num);
-
-	devtree_update();
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/starlabs/starlite_adl/mainboard.c b/src/mainboard/starlabs/starlite_adl/mainboard.c
index b82e2c0eba..1583ad9094 100644
--- a/src/mainboard/starlabs/starlite_adl/mainboard.c
+++ b/src/mainboard/starlabs/starlite_adl/mainboard.c
@@ -3,7 +3,6 @@
 #include <acpi/acpigen_ps2_keybd.h>
 #include <device/device.h>
 #include <soc/ramstage.h>
-#include <option.h>
 #include <variants.h>
 
 static void init_mainboard(void *chip_info)
@@ -13,18 +12,13 @@ static void init_mainboard(void *chip_info)
 
 	pads = variant_gpio_table(&num);
 	gpio_configure_pads(pads, num);
-
-	devtree_update();
 }
 
 static void mainboard_fill_ssdt(const struct device *dev)
 {
-	enum ps2_action_key ps2_action_keys[2] = {
-		PS2_KEY_VOL_DOWN,
-		PS2_KEY_VOL_UP
-	};
-	acpigen_ps2_keyboard_dsd("_SB.PCI0.PS2K", ARRAY_SIZE(ps2_action_keys),
-		ps2_action_keys, false, false, false, false, false);
+	enum ps2_action_key ps2_action_keys[2] = {PS2_KEY_VOL_DOWN, PS2_KEY_VOL_UP};
+	acpigen_ps2_keyboard_dsd("_SB.PCI0.PS2K", ARRAY_SIZE(ps2_action_keys), ps2_action_keys,
+				 false, false, false, false, false);
 }
 
 static void enable_mainboard(struct device *dev)