diff --git a/ur_driver/CMakeLists.txt b/ur_driver/CMakeLists.txt
index 1d3eb37d6aecd9d621af5319323e448967cf1924..c452f0faef593d501ae0ab9c60b7cf769cce9567 100644
--- a/ur_driver/CMakeLists.txt
+++ b/ur_driver/CMakeLists.txt
@@ -4,7 +4,7 @@ project(ur_driver)
 ## 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 roscpp rospy std_msgs message_generation ur_msgs)
+find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs ur_msgs)
 
 catkin_python_setup()
 
diff --git a/ur_driver/package.xml b/ur_driver/package.xml
index c93b767158946a9e1e1cd3c181f19824d5e989b3..2f64d4fdb89fdcb91e645e3db59274753c7dba9a 100644
--- a/ur_driver/package.xml
+++ b/ur_driver/package.xml
@@ -13,23 +13,15 @@
   <author email="sedwards@swri.org">Shaun Edwards</author>
 
 
-
-  <run_depend>python-beautifulsoup</run_depend>
-
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>actionlib</build_depend>
-  <build_depend>control_msgs</build_depend>
-  <build_depend>rospy</build_depend>
-  <build_depend>sensor_msgs</build_depend>
-  <build_depend>trajectory_msgs</build_depend>
-  <build_depend>ur_msgs</build_depend>
+  
+  <run_depend>rospy</run_depend>
   <run_depend>actionlib</run_depend>
   <run_depend>control_msgs</run_depend>
-  <run_depend>rospy</run_depend>
   <run_depend>sensor_msgs</run_depend>
   <run_depend>trajectory_msgs</run_depend>
-  <run_depend>python-beautifulsoup</run_depend>
   <run_depend>ur_msgs</run_depend>
+  <run_depend>python-beautifulsoup</run_depend>
 
 
   <export>