diff --git a/safety_user_plugin/CMakeLists.txt b/safety_user_plugin/CMakeLists.txt
index 52c3c0b..d193766 100644
--- a/safety_user_plugin/CMakeLists.txt
+++ b/safety_user_plugin/CMakeLists.txt
@@ -13,7 +13,6 @@ find_package(catkin REQUIRED COMPONENTS
   rqt_gui_py
   std_msgs
   geometry_msgs
-  message_generation
 )
 
 ## System dependencies are found with CMake's conventions
@@ -50,11 +49,11 @@ catkin_python_setup()
 ##   * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
 
 ## Generate messages in the 'msg' folder
- add_message_files(
-   FILES
-   RestrictionsMsg.msg
-   RobotInfoMsg.msg
- )
+# add_message_files(
+#   FILES
+#   RestrictionsMsg.msg
+#   RobotInfoMsg.msg
+# )
 
 ## Generate services in the 'srv' folder
 # add_service_files(
@@ -71,11 +70,11 @@ catkin_python_setup()
 # )
 
 ## Generate added messages and services with any dependencies listed here
- generate_messages(
-   DEPENDENCIES
-   std_msgs
-   geometry_msgs
- )
+# generate_messages(
+#   DEPENDENCIES
+#   std_msgs
+#   geometry_msgs
+# )
 
 ################################################
 ## Declare ROS dynamic reconfigure parameters ##
diff --git a/safety_user_plugin/msg/RestrictionsMsg.msg b/safety_user_plugin/msg/RestrictionsMsg.msg
deleted file mode 100644
index 2b0aa55..0000000
--- a/safety_user_plugin/msg/RestrictionsMsg.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-std_msgs/Float64 distance
-std_msgs/Float64 linear_velocity
-std_msgs/Float64 angular_velocity
\ No newline at end of file
diff --git a/safety_user_plugin/msg/RobotInfoMsg.msg b/safety_user_plugin/msg/RobotInfoMsg.msg
deleted file mode 100644
index 00b7665..0000000
--- a/safety_user_plugin/msg/RobotInfoMsg.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-std_msgs/UInt8 robot_id
-std_msgs/Float64 battery_voltage
-geometry_msgs/Twist twist
-std_msgs/Bool state
-std_msgs/Bool clutch
\ No newline at end of file
diff --git a/safety_user_plugin/package.xml b/safety_user_plugin/package.xml
index ed32ff3..6255728 100644
--- a/safety_user_plugin/package.xml
+++ b/safety_user_plugin/package.xml
@@ -14,14 +14,12 @@
   <build_depend>rqt_gui</build_depend>
   <build_depend>rqt_gui_py</build_depend>
   <build_depend>std_msgs</build_depend>
-  <build_depend>message_generation</build_depend>
   <build_depend>rosaria_msgs</build_depend>
   
   <build_export_depend>rospy</build_export_depend>
   <build_export_depend>rqt_gui</build_export_depend>
   <build_export_depend>rqt_gui_py</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
-  <build_export_depend>message_generation</build_export_depend>
   <build_export_depend>rosaria_msgs</build_export_depend>
 
   <exec_depend>rospy</exec_depend>