diff --git a/cmake/configs/nuttx_aerofc-v1_default.cmake b/cmake/configs/nuttx_aerofc-v1_default.cmake
index b164f834b6743020cdb99b4f8b52879ba79f8a82..4925f875650e1f12a7bb759fb3735008c1b1b6a4 100644
--- a/cmake/configs/nuttx_aerofc-v1_default.cmake
+++ b/cmake/configs/nuttx_aerofc-v1_default.cmake
@@ -62,7 +62,6 @@ set(config_module_list
 	#
 	modules/mc_att_control
 	modules/mc_pos_control
-	modules/vtol_att_control # FIXME: only required for params needed by Navigator
 
 	#
 	# Logging
diff --git a/cmake/configs/nuttx_crazyflie_default.cmake b/cmake/configs/nuttx_crazyflie_default.cmake
index 2d2078e0b316fa02cf707d3d9e75e96e9877226b..688e4c2fc88533880056649977f569dd760e0ade 100644
--- a/cmake/configs/nuttx_crazyflie_default.cmake
+++ b/cmake/configs/nuttx_crazyflie_default.cmake
@@ -62,7 +62,6 @@ set(config_module_list
 	# modules/fw_att_control
 	modules/mc_att_control
 	modules/mc_pos_control
-	modules/vtol_att_control # FIXME: only required for params needed by Navigator
 
 	#
 	# Logging
diff --git a/cmake/configs/nuttx_omnibus-f4sd_default.cmake b/cmake/configs/nuttx_omnibus-f4sd_default.cmake
index ddb1b9a37ad5175668115a5bbade0ac32a21f703..883dda94886f2253a1684ae8080f6402dfa5e4fe 100644
--- a/cmake/configs/nuttx_omnibus-f4sd_default.cmake
+++ b/cmake/configs/nuttx_omnibus-f4sd_default.cmake
@@ -89,13 +89,13 @@ set(config_module_list
 	#
 	# Vehicle Control
 	#
-	modules/fw_att_control
-	modules/fw_pos_control_l1
+	#modules/fw_att_control
+	#modules/fw_pos_control_l1
 	#modules/gnd_att_control
 	#modules/gnd_pos_control
 	modules/mc_att_control
 	modules/mc_pos_control
-	modules/vtol_att_control
+	#modules/vtol_att_control
 
 	#
 	# Logging