diff --git a/boards/holybro/kakutef7/default.px4board b/boards/holybro/kakutef7/default.px4board
index ec4361a416..dce8a9548b 100644
--- a/boards/holybro/kakutef7/default.px4board
+++ b/boards/holybro/kakutef7/default.px4board
@@ -26,7 +26,6 @@ CONFIG_MODULES_EVENTS=y
 CONFIG_MODULES_FLIGHT_MODE_MANAGER=y
 CONFIG_MODULES_GYRO_CALIBRATION=y
 CONFIG_MODULES_LAND_DETECTOR=y
-CONFIG_MODULES_LOAD_MON=y
 CONFIG_MODULES_LOGGER=y
 CONFIG_MODULES_MAVLINK=y
 CONFIG_MODULES_MC_ATT_CONTROL=y
@@ -41,8 +40,5 @@ CONFIG_SYSTEMCMDS_DMESG=y
 CONFIG_SYSTEMCMDS_HARDFAULT_LOG=y
 CONFIG_SYSTEMCMDS_MIXER=y
 CONFIG_SYSTEMCMDS_PARAM=y
-CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_PWM=y
 CONFIG_SYSTEMCMDS_REBOOT=y
-CONFIG_SYSTEMCMDS_TOP=y
-CONFIG_SYSTEMCMDS_VER=y
diff --git a/platforms/nuttx/NuttX/Make.defs.in b/platforms/nuttx/NuttX/Make.defs.in
index 5299325b46..aa31120077 100644
--- a/platforms/nuttx/NuttX/Make.defs.in
+++ b/platforms/nuttx/NuttX/Make.defs.in
@@ -90,7 +90,7 @@ ARCHCCMAJOR = $(shell echo $(ARCHCCVERSION) | cut -d'.' -f1)
 ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
    MAXOPTIMIZATION = $(CONFIG_DEBUG_OPTLEVEL)
 else
-   MAXOPTIMIZATION = -Os
+   MAXOPTIMIZATION = ${MAX_CUSTOM_OPT_LEVEL}
 endif
 
 FLAGS = $(MAXOPTIMIZATION) -g2 \