diff --git a/src/modules/dataman/dataman.h b/src/modules/dataman/dataman.h
index c8cdb05af0..b6fe5c6a67 100644
--- a/src/modules/dataman/dataman.h
+++ b/src/modules/dataman/dataman.h
@@ -67,18 +67,6 @@ typedef enum {
 } dm_function_t;
 
 /** The maximum number of instances for each item type */
-#if defined(MEMORY_CONSTRAINED_SYSTEM)
-enum {
-	DM_KEY_SAFE_POINTS_MAX = 8,
-	DM_KEY_SAFE_POINTS_STATE_MAX = 1,
-	DM_KEY_FENCE_POINTS_MAX = 16,
-	DM_KEY_FENCE_POINTS_STATE_MAX = 1,
-	DM_KEY_WAYPOINTS_OFFBOARD_0_MAX = NUM_MISSIONS_SUPPORTED,
-	DM_KEY_WAYPOINTS_OFFBOARD_1_MAX = NUM_MISSIONS_SUPPORTED,
-	DM_KEY_MISSION_STATE_MAX = 1,
-	DM_KEY_COMPAT_MAX = 1
-};
-#else
 enum {
 	DM_KEY_SAFE_POINTS_MAX = 32,
 	DM_KEY_SAFE_POINTS_STATE_MAX = 1,
@@ -89,7 +77,6 @@ enum {
 	DM_KEY_MISSION_STATE_MAX = 1,
 	DM_KEY_COMPAT_MAX = 1
 };
-#endif
 
 /* table of maximum number of instances for each item type */
 static const unsigned g_per_item_max_index[DM_KEY_NUM_KEYS] = {
diff --git a/src/modules/navigator/navigation.h b/src/modules/navigator/navigation.h
index f3db822a8f..5ff821707f 100644
--- a/src/modules/navigator/navigation.h
+++ b/src/modules/navigator/navigation.h
@@ -46,9 +46,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#if defined(MEMORY_CONSTRAINED_SYSTEM)
-#  define NUM_MISSIONS_SUPPORTED 50
-#elif defined(__PX4_POSIX)
+#if defined(__PX4_POSIX)
 #  define NUM_MISSIONS_SUPPORTED (UINT16_MAX-1) // This is allocated as needed.
 #else
 #  define NUM_MISSIONS_SUPPORTED 500