diff --git a/msg/CMakeLists.txt b/msg/CMakeLists.txt
index 9ff635370d..02eee61359 100644
--- a/msg/CMakeLists.txt
+++ b/msg/CMakeLists.txt
@@ -55,7 +55,6 @@ set(msg_files
 	esc_report.msg
 	esc_status.msg
 	estimator_status.msg
-	filtered_bottom_flow.msg
 	follow_target.msg
 	fw_pos_ctrl_status.msg
 	geofence_result.msg
diff --git a/msg/filtered_bottom_flow.msg b/msg/filtered_bottom_flow.msg
deleted file mode 100644
index 1de919ee92..0000000000
--- a/msg/filtered_bottom_flow.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Filtered bottom flow in bodyframe.
-
-float32 sumx				# Integrated bodyframe x flow in meters
-float32 sumy				# Integrated bodyframe y flow in meters
-
-float32 vx 				# Flow bodyframe x speed, m/s
-float32 vy				# Flow bodyframe y Speed, m/s
diff --git a/msg/tools/uorb_rtps_message_ids.py b/msg/tools/uorb_rtps_message_ids.py
index b337331bbc..e683ebd843 100644
--- a/msg/tools/uorb_rtps_message_ids.py
+++ b/msg/tools/uorb_rtps_message_ids.py
@@ -15,7 +15,7 @@ msg_id_map = {
     'camera_trigger': 10,
     'collision_report': 11,
     'commander_state': 12,
-    'control_state': 13,
+
     'cpuload': 14,
     'debug_key_value': 15,
     'differential_pressure': 16,
@@ -28,13 +28,13 @@ msg_id_map = {
     'estimator_status': 23,
     'fence': 24,
     'fence_vertex': 25,
-    'filtered_bottom_flow': 26,
+
     'follow_target': 27,
     'fw_pos_ctrl_status': 28,
     'geofence_result': 29,
     'gps_dump': 30,
     'gps_inject_data': 31,
-    'hil_sensor': 32,
+
     'home_position': 33,
     'input_rc': 34,
     'led_control': 35,