diff --git a/messages/OdomMessage.options b/messages/OdomMessage.options
deleted file mode 100644
index 8a2e197fd959cb45ef63ac8f6de5a61273705aeb..0000000000000000000000000000000000000000
--- a/messages/OdomMessage.options
+++ /dev/null
@@ -1 +0,0 @@
-*.* proto3_singular_msgs:true
\ No newline at end of file
diff --git a/messages/OdomMessage.proto b/messages/OdomMessage.proto
deleted file mode 100644
index 68628d717cee0065d37c5b74c016c668f4fed285..0000000000000000000000000000000000000000
--- a/messages/OdomMessage.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-syntax = "proto3";
-
-package status_message;
-
-message Point2D {
-  float x = 1;
-  float y = 2;
-}
-
-/**
-* Robot odometry message
-*/
-message OdomMessage {
-  /**
-  * Sensor ID used to differentiate the code wheels, LIDAR, ToF, ...
-  */
-  int32 sensor_id = 1;
-  /**
-  * Cartesian coordinates in meters of the robot center point
-  */
-  Point2D position = 2;
-  /**
-  * Yaw angle in radians of the robot center point
-  */
-  float angle = 3;
-
-  /**
-  * Linear speed in meters/sec of the robot center point
-  */
-  float linearSpeed = 4;
-  /**
-  * Angular speed in radians/sec of the robot center point
-  */
-  float angularSpeed = 5;
-}
diff --git a/messages/StatusMessage.options b/messages/StatusMessage.options
deleted file mode 100644
index 8a2e197fd959cb45ef63ac8f6de5a61273705aeb..0000000000000000000000000000000000000000
--- a/messages/StatusMessage.options
+++ /dev/null
@@ -1 +0,0 @@
-*.* proto3_singular_msgs:true
\ No newline at end of file
diff --git a/messages/StatusMessage.proto b/messages/StatusMessage.proto
deleted file mode 100644
index ae3f50c35863d7f475d1e2bff5e54a18813e49c3..0000000000000000000000000000000000000000
--- a/messages/StatusMessage.proto
+++ /dev/null
@@ -1,22 +0,0 @@
-syntax = "proto3";
-import "google/protobuf/timestamp.proto";
-
-import "ToFMessage.proto";
-import "OdomMessage.proto";
-
-package status_message;
-
-/**
-* Robot status message at a given time
-*/
-message StatusMessage {
-
-  int32 id = 1;
-  
-  google.protobuf.Timestamp timestamp = 2;
-
-  oneof body {
-    ToFMessage tof = 3;
-    OdomMessage odom = 4;
-  }
-}
diff --git a/messages/ToFMessage.options b/messages/ToFMessage.options
deleted file mode 100644
index 8a2e197fd959cb45ef63ac8f6de5a61273705aeb..0000000000000000000000000000000000000000
--- a/messages/ToFMessage.options
+++ /dev/null
@@ -1 +0,0 @@
-*.* proto3_singular_msgs:true
\ No newline at end of file
diff --git a/messages/ToFMessage.proto b/messages/ToFMessage.proto
deleted file mode 100644
index c56a64843d5637717078cc4d74b2e39fc621d71b..0000000000000000000000000000000000000000
--- a/messages/ToFMessage.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-package status_message;
-
-/**
-* Time of flight sensor message
-*/
-message ToFMessage {
-  int32 sensor_id = 1;
-  float distance = 2;
-}