diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1308d17617619cbb7dbaf2bc734aedca63094984..a10e7cf2a4109d133efde34b8848794a5658ad9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,14 @@ project(lrs_msgs)
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
-find_package(catkin REQUIRED COMPONENTS message_generation geometry_msgs roscpp rospy std_msgs lrs_util_gs)
+find_package(catkin REQUIRED COMPONENTS 
+  message_generation 
+  geometry_msgs 
+  roscpp 
+  rospy 
+  std_msgs 
+  lrs_util_gs
+)
 
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)
@@ -28,11 +35,6 @@ ExtData.msg
 ExtConfig.msg
 GridObject.msg
 HeliState.msg
-LQHorizontalCommand.msg
-LQVerticalCommand.msg
-LQHeadingCommand.msg
-LQCommandEndConditionSpec.msg
-LQCommand.msg
 LQClimbCommand.msg
 LQClimbCommand.msg
 LQRCExtraSwitch.msg
diff --git a/msg/LQCommand.msg b/msg/LQCommand.msg
deleted file mode 100644
index 0cf96223a541e5c16c4fc4b42959078c24c9e0f9..0000000000000000000000000000000000000000
--- a/msg/LQCommand.msg
+++ /dev/null
@@ -1,16 +0,0 @@
-int32 MODE_EMPTY=0
-int32 MODE_COMMAND=1
-int32 MODE_TST_NODE_END_MARKER=2
-int32 MODE_COMMENT=3
-
-LQHorizontalCommand horizontal
-LQVerticalCommand vertical
-LQHeadingCommand heading
-LQCommandEndConditionSpec end_condition_spec
-
-int32 mode
-int32 tst_unique_node_id
-bool finished
-string name     # Limited to 10 characters and will be synced
-string comment
-
diff --git a/msg/LQCommandEndConditionSpec.msg b/msg/LQCommandEndConditionSpec.msg
deleted file mode 100644
index fd68157e1350e82ef55173003231f9af30daa2de..0000000000000000000000000000000000000000
--- a/msg/LQCommandEndConditionSpec.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-int32 timeout         # seconds
-bool horizontal
-bool vertical
-bool heading
-int32 wait_after_end_condition # seconds
-bool user_input
-int32 wait_after_user_input    # seconds
diff --git a/msg/LQHeadingCommand.msg b/msg/LQHeadingCommand.msg
deleted file mode 100644
index ccfa7ca92596a5898f00eec68d9536f2af5d8c7e..0000000000000000000000000000000000000000
--- a/msg/LQHeadingCommand.msg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-int32 MODE_IGNORE = 0
-int32 MODE_HEADING_ABSOLUTE = 1
-int32 MODE_HEADING_RELATIVE = 2
-int32 MODE_HEADING_BODY_RELATIVE = 3
-int32 MODE_HEADING_RATE = 3
-int32 MODE_HEADING_POINT = 3
-int32 MODE_EXTERNAL_POSITION = 4
-int32 MODE_EXTERNAL_RATE = 5
-int32 MODE_IN_FLIGHT_DIRECTION = 6
-int32 MODE_TOWARDS_POINT = 6
-int32 MODE_TOWARDS_EXTERNAL_POINT = 7
-int32 MODE_RC_STICK_VELOCITY = 8
-
-int32 mode
-float32 x       # For MODE_HEADING_POINT
-float32 y       # For MODE_HEADING_POINT
-float32 heading # Degreees, 0 towards north, postitive clockwise
-float32 rate
-bool use_rate_sign
diff --git a/msg/LQHorizontalCommand.msg b/msg/LQHorizontalCommand.msg
deleted file mode 100644
index 498aa74697591a05df704212f246a3dad9c831c9..0000000000000000000000000000000000000000
--- a/msg/LQHorizontalCommand.msg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-int32 MODE_IGNORE = 0
-int32 MODE_USE = 1
-int32 MODE_HORIZONTAL_ABSOLUTE = 2
-int32 MODE_HORIZONTAL_RELATIVE = 3
-int32 MODE_HORIZONTAL_BODY_RELATIVE = 4
-int32 MODE_EXTERNAL_POSITION = 5
-int32 MODE_EXTERNAL_VELOCITY = 6
-int32 MODE_KEEP_DISTANCE = 7
-int32 MODE_RC_STICK_VELOCITY = 8
-
-int32 mode
-float32 x           # standard ros x, east; absolute offset in external modes
-float32 y           # standard ros y, north; absolute offset in external modes
-float32 speed
-float32 speed_end   # speed_end <= speed
-bool speed_depends_on_heading         # Slow down while adjusting heading
-bool speed_depends_on_vertical        # Slow down while adjusting vertical
-float32 distance
diff --git a/msg/LQVerticalCommand.msg b/msg/LQVerticalCommand.msg
deleted file mode 100644
index 6f64765985bd19e9dc5e6d20c4813955fec55c62..0000000000000000000000000000000000000000
--- a/msg/LQVerticalCommand.msg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-int32 MODE_IGNORE = 0
-int32 MODE_VERTICAL_ABSOLUTE = 1
-int32 MODE_VERTICAL_RELATIVE = 2
-int32 MODE_WITH_HORIZONTAL = 3
-int32 MODE_EXTERNAL_POSITION = 4
-int32 MODE_EXTERNAL_VELOCITY = 5
-int32 MODE_RC_STICK_VELOCITY = 6
-
-int32 mode
-float32 z          # ros z, up, offset in external modes
-float32 speed
-