diff --git a/recipes-ros/common-msgs/sensor-msgs_1.11.9.bb b/recipes-ros/common-msgs/sensor-msgs_1.11.9.bb
index 1f74e39..64b3f49 100644
--- a/recipes-ros/common-msgs/sensor-msgs_1.11.9.bb
+++ b/recipes-ros/common-msgs/sensor-msgs_1.11.9.bb
@@ -7,3 +7,5 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc
 DEPENDS = "geometry-msgs"
 
 require common-msgs.inc
+
+RDEPENDS_${PN} += "geometry-msgs"
diff --git a/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb b/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb
index 2c025e5..3b719af 100644
--- a/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb
+++ b/recipes-ros/geometric-shapes/geometric-shapes_0.4.5.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=5ee5b8b046ae48ad94a2037ca953a67b"
 
-DEPENDS = "boost shape-msgs shape-tools octomap assimp libeigen qhull console-bridge random-numbers eigen-stl-containers resource-retriever"
+DEPENDS = "boost shape-msgs octomap assimp libeigen qhull console-bridge random-numbers eigen-stl-containers resource-retriever visualization-msgs"
 
 SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "2a11cd903e581f4e9cef57551e3f284b"
diff --git a/recipes-ros/packagegroups/packagegroup-ros-world.bb b/recipes-ros/packagegroups/packagegroup-ros-world.bb
index f72a21d..78b5396 100644
--- a/recipes-ros/packagegroups/packagegroup-ros-world.bb
+++ b/recipes-ros/packagegroups/packagegroup-ros-world.bb
@@ -96,7 +96,6 @@ RDEPENDS_${PN} = "\
     image-rotate \
     stereo-image-proc \
     random-numbers \
-    shape-tools \
     octomap-msgs \
     pcl-msgs \
     laser-geometry \
diff --git a/recipes-ros/shape-tools/shape-tools_0.2.1.bb b/recipes-ros/shape-tools/shape-tools_0.2.1.bb
deleted file mode 100644
index 1474916..0000000
--- a/recipes-ros/shape-tools/shape-tools_0.2.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Tools for operating on shape messages."
-SECTION = "devel"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=5ee5b8b046ae48ad94a2037ca953a67b"
-
-DEPENDS = "shape-msgs visualization-msgs"
-
-SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "75e12ba67d11470a1028eaf38f792604"
-SRC_URI[sha256sum] = "19a11713c78e409a466bca5168a7710e096a92f92fcafef4fa485bc7606eaf3e"
-
-S = "${WORKDIR}/${ROS_SP}"
-
-inherit catkin