diff --git a/boards/cuav/nora/default.px4board b/boards/cuav/nora/default.px4board
index 3be46ebeea..ced81cf9f4 100644
--- a/boards/cuav/nora/default.px4board
+++ b/boards/cuav/nora/default.px4board
@@ -84,7 +84,6 @@ CONFIG_SYSTEMCMDS_I2CDETECT=y
 CONFIG_SYSTEMCMDS_LED_CONTROL=y
 CONFIG_SYSTEMCMDS_MFT=y
 CONFIG_SYSTEMCMDS_MIXER=y
-CONFIG_SYSTEMCMDS_MOTOR_RAMP=y
 CONFIG_SYSTEMCMDS_MOTOR_TEST=y
 CONFIG_SYSTEMCMDS_MTD=y
 CONFIG_SYSTEMCMDS_NSHTERM=y
@@ -92,9 +91,6 @@ CONFIG_SYSTEMCMDS_PARAM=y
 CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_PWM=y
 CONFIG_SYSTEMCMDS_REBOOT=y
-CONFIG_SYSTEMCMDS_REFLECT=y
-CONFIG_SYSTEMCMDS_SD_BENCH=y
-CONFIG_SYSTEMCMDS_SERIAL_TEST=y
 CONFIG_SYSTEMCMDS_SYSTEM_TIME=y
 CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
diff --git a/boards/cuav/nora/test.px4board b/boards/cuav/nora/test.px4board
index 4d6fbc15a5..549492585d 100644
--- a/boards/cuav/nora/test.px4board
+++ b/boards/cuav/nora/test.px4board
@@ -6,6 +6,9 @@ CONFIG_DRIVERS_RPM=n
 CONFIG_DRIVERS_SMART_BATTERY_BATMON=n
 CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n
 CONFIG_MODULES_ROVER_POS_CONTROL=n
+CONFIG_SYSTEMCMDS_SYSTEM_TIME=n
 CONFIG_BOARD_TESTING=y
 CONFIG_DRIVERS_TEST_PPM=y
 CONFIG_SYSTEMCMDS_MICROBENCH=y
+CONFIG_SYSTEMCMDS_SD_BENCH=y
+CONFIG_SYSTEMCMDS_SERIAL_TEST=y
diff --git a/boards/cuav/x7pro/default.px4board b/boards/cuav/x7pro/default.px4board
index c0883d1f1c..c5f83db0a1 100644
--- a/boards/cuav/x7pro/default.px4board
+++ b/boards/cuav/x7pro/default.px4board
@@ -85,7 +85,6 @@ CONFIG_SYSTEMCMDS_I2CDETECT=y
 CONFIG_SYSTEMCMDS_LED_CONTROL=y
 CONFIG_SYSTEMCMDS_MFT=y
 CONFIG_SYSTEMCMDS_MIXER=y
-CONFIG_SYSTEMCMDS_MOTOR_RAMP=y
 CONFIG_SYSTEMCMDS_MOTOR_TEST=y
 CONFIG_SYSTEMCMDS_MTD=y
 CONFIG_SYSTEMCMDS_NSHTERM=y
@@ -93,10 +92,7 @@ CONFIG_SYSTEMCMDS_PARAM=y
 CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_PWM=y
 CONFIG_SYSTEMCMDS_REBOOT=y
-CONFIG_SYSTEMCMDS_REFLECT=y
 CONFIG_SYSTEMCMDS_SD_BENCH=y
-CONFIG_SYSTEMCMDS_SERIAL_TEST=y
-CONFIG_SYSTEMCMDS_SYSTEM_TIME=y
 CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
 CONFIG_SYSTEMCMDS_TUNE_CONTROL=y
diff --git a/boards/cubepilot/cubeorange/test.px4board b/boards/cubepilot/cubeorange/test.px4board
index c75590094d..dbcb041e6f 100644
--- a/boards/cubepilot/cubeorange/test.px4board
+++ b/boards/cubepilot/cubeorange/test.px4board
@@ -8,7 +8,9 @@ CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n
 CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIH=n
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
+CONFIG_SYSTEMCMDS_MOTOR_RAMP=n
 CONFIG_SYSTEMCMDS_REFLECT=n
+CONFIG_SYSTEMCMDS_SYSTEM_TIME=n
 CONFIG_BOARD_TESTING=y
 CONFIG_DRIVERS_TEST_PPM=y
 CONFIG_SYSTEMCMDS_MICROBENCH=y
diff --git a/boards/holybro/durandal-v1/default.px4board b/boards/holybro/durandal-v1/default.px4board
index b525c2195c..ef62f8f77e 100644
--- a/boards/holybro/durandal-v1/default.px4board
+++ b/boards/holybro/durandal-v1/default.px4board
@@ -87,9 +87,7 @@ CONFIG_SYSTEMCMDS_PARAM=y
 CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_PWM=y
 CONFIG_SYSTEMCMDS_REBOOT=y
-CONFIG_SYSTEMCMDS_REFLECT=y
 CONFIG_SYSTEMCMDS_SD_BENCH=y
-CONFIG_SYSTEMCMDS_SERIAL_TEST=y
 CONFIG_SYSTEMCMDS_SYSTEM_TIME=y
 CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
diff --git a/boards/holybro/durandal-v1/test.px4board b/boards/holybro/durandal-v1/test.px4board
index e930e6444a..31dd9252d3 100644
--- a/boards/holybro/durandal-v1/test.px4board
+++ b/boards/holybro/durandal-v1/test.px4board
@@ -11,7 +11,9 @@ CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n
 CONFIG_MODULES_ROVER_POS_CONTROL=n
 CONFIG_MODULES_SIH=n
 CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
-CONFIG_SYSTEMCMDS_REFLECT=n
+CONFIG_SYSTEMCMDS_MOTOR_RAMP=n
+CONFIG_SYSTEMCMDS_SYSTEM_TIME=n
 CONFIG_BOARD_TESTING=y
 CONFIG_DRIVERS_TEST_PPM=y
 CONFIG_SYSTEMCMDS_MICROBENCH=y
+CONFIG_SYSTEMCMDS_SERIAL_TEST=y
diff --git a/boards/nxp/fmurt1062-v1/default.px4board b/boards/nxp/fmurt1062-v1/default.px4board
index c47b4fefb9..1e2e73bbf6 100644
--- a/boards/nxp/fmurt1062-v1/default.px4board
+++ b/boards/nxp/fmurt1062-v1/default.px4board
@@ -52,7 +52,6 @@ CONFIG_SYSTEMCMDS_I2CDETECT=y
 CONFIG_SYSTEMCMDS_LED_CONTROL=y
 CONFIG_SYSTEMCMDS_MFT=y
 CONFIG_SYSTEMCMDS_MIXER=y
-CONFIG_SYSTEMCMDS_MOTOR_RAMP=y
 CONFIG_SYSTEMCMDS_MOTOR_TEST=y
 CONFIG_SYSTEMCMDS_MTD=y
 CONFIG_SYSTEMCMDS_NSHTERM=y
@@ -60,9 +59,7 @@ CONFIG_SYSTEMCMDS_PARAM=y
 CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_PWM=y
 CONFIG_SYSTEMCMDS_REBOOT=y
-CONFIG_SYSTEMCMDS_REFLECT=y
 CONFIG_SYSTEMCMDS_SD_BENCH=y
-CONFIG_SYSTEMCMDS_SYSTEM_TIME=y
 CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
 CONFIG_SYSTEMCMDS_TUNE_CONTROL=y
diff --git a/boards/px4/fmu-v2/multicopter.px4board b/boards/px4/fmu-v2/multicopter.px4board
index 317c0cadb2..f16435d6a4 100644
--- a/boards/px4/fmu-v2/multicopter.px4board
+++ b/boards/px4/fmu-v2/multicopter.px4board
@@ -5,9 +5,6 @@ CONFIG_SYSTEMCMDS_BL_UPDATE=n
 CONFIG_COMMON_DISTANCE_SENSOR=y
 CONFIG_DRIVERS_CAMERA_CAPTURE=y
 CONFIG_DRIVERS_CAMERA_TRIGGER=y
-CONFIG_DRIVERS_IRLOCK=y
-CONFIG_MODULES_CAMERA_FEEDBACK=y
 CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=y
 CONFIG_MODULES_LOAD_MON=y
-CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_VER=y
diff --git a/boards/px4/fmu-v2/test.px4board b/boards/px4/fmu-v2/test.px4board
index 996a9a63b8..a37ade7436 100644
--- a/boards/px4/fmu-v2/test.px4board
+++ b/boards/px4/fmu-v2/test.px4board
@@ -7,8 +7,6 @@ CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n
 CONFIG_SYSTEMCMDS_BL_UPDATE=n
 CONFIG_BOARD_ROMFSROOT="px4fmu_test"
 CONFIG_BOARD_TESTING=y
-CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y
-CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y
 CONFIG_SYSTEMCMDS_MICROBENCH=y
 CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_VER=y
diff --git a/boards/px4/fmu-v6x/default.px4board b/boards/px4/fmu-v6x/default.px4board
index 2dcada6739..6de790c181 100644
--- a/boards/px4/fmu-v6x/default.px4board
+++ b/boards/px4/fmu-v6x/default.px4board
@@ -74,14 +74,11 @@ CONFIG_MODULES_VMOUNT=y
 CONFIG_MODULES_VTOL_ATT_CONTROL=y
 CONFIG_SYSTEMCMDS_BL_UPDATE=y
 CONFIG_SYSTEMCMDS_DMESG=y
-CONFIG_SYSTEMCMDS_ESC_CALIB=y
-CONFIG_SYSTEMCMDS_GPIO=y
 CONFIG_SYSTEMCMDS_HARDFAULT_LOG=y
 CONFIG_SYSTEMCMDS_I2CDETECT=y
 CONFIG_SYSTEMCMDS_LED_CONTROL=y
 CONFIG_SYSTEMCMDS_MFT=y
 CONFIG_SYSTEMCMDS_MIXER=y
-CONFIG_SYSTEMCMDS_MOTOR_RAMP=y
 CONFIG_SYSTEMCMDS_MOTOR_TEST=y
 CONFIG_SYSTEMCMDS_MTD=y
 CONFIG_SYSTEMCMDS_NETMAN=y