diff --git a/ack/install.yaml b/ack/install.yaml
deleted file mode 100644
index 30246abf9..000000000
--- a/ack/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: ack-grep
diff --git a/ack/setup b/ack/setup
deleted file mode 100644
index a9602c604..000000000
--- a/ack/setup
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-
-alias ack="ack-grep --follow"
diff --git a/amigo-start/install.yaml b/amigo-start/install.yaml
index 18ee032d3..0a40cf504 100644
--- a/amigo-start/install.yaml
+++ b/amigo-start/install.yaml
@@ -11,7 +11,7 @@
   name: ros-amigo_description
 
 - type: target
-  name: ros-robot_state_publisher
+  name: robot_state_publisher
 
 - type: target
   name: ros-rosbridge_server
diff --git a/armadillo/install.yaml b/armadillo/install.yaml
deleted file mode 100644
index 5dbc50c94..000000000
--- a/armadillo/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libarmadillo-dev
diff --git a/assimp/install.yaml b/assimp/install.yaml
deleted file mode 100644
index ce9f5e9e3..000000000
--- a/assimp/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libassimp-dev
diff --git a/autoconf/install.yaml b/autoconf/install.yaml
deleted file mode 100644
index 14ef32ec9..000000000
--- a/autoconf/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: autoconf
diff --git a/automake/install.yaml b/automake/install.yaml
deleted file mode 100644
index a7a57e696..000000000
--- a/automake/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: automake
diff --git a/boost/install.yaml b/boost/install.yaml
deleted file mode 100644
index 7850e4832..000000000
--- a/boost/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libboost-all-dev
diff --git a/bullet/install.yaml b/bullet/install.yaml
deleted file mode 100644
index 15ad49afb..000000000
--- a/bullet/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libbullet-dev
diff --git a/bundler/install.yaml b/bundler/install.yaml
deleted file mode 100644
index d704888ce..000000000
--- a/bundler/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: bundler
diff --git a/bzip2/install.yaml b/bzip2/install.yaml
deleted file mode 100644
index a12664303..000000000
--- a/bzip2/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: bzip2
diff --git a/castxml/install.yaml b/castxml/install.yaml
deleted file mode 100644
index b05c961f2..000000000
--- a/castxml/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: castxml
diff --git a/chrony/install.yaml b/chrony/install.yaml
deleted file mode 100644
index 0f06234fa..000000000
--- a/chrony/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: chrony
diff --git a/cppunit/install.yaml b/cppunit/install.yaml
deleted file mode 100644
index 2a6e6711c..000000000
--- a/cppunit/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libcppunit-dev
diff --git a/eigen/install.yaml b/eigen/install.yaml
deleted file mode 100644
index c839f9f00..000000000
--- a/eigen/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libeigen3-dev
diff --git a/festival/install.yaml b/festival/install.yaml
deleted file mode 100644
index ad77d5f2e..000000000
--- a/festival/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: festival
diff --git a/ffmpeg/install.yaml b/ffmpeg/install.yaml
deleted file mode 100644
index da998a310..000000000
--- a/ffmpeg/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: ffmpeg
diff --git a/gawk/install.yaml b/gawk/install.yaml
deleted file mode 100644
index 42e7f55e5..000000000
--- a/gawk/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: gawk
diff --git a/gccxml/install.yaml b/gccxml/install.yaml
deleted file mode 100644
index a793442fa..000000000
--- a/gccxml/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: gccxml
diff --git a/gimp/install.yaml b/gimp/install.yaml
deleted file mode 100644
index 9dcebe842..000000000
--- a/gimp/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: gimp
diff --git a/glut/install.yaml b/glut/install.yaml
deleted file mode 100644
index 8d0ea68fc..000000000
--- a/glut/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: freeglut3-dev
diff --git a/graphviz/install.yaml b/graphviz/install.yaml
deleted file mode 100644
index 8d9fc14c8..000000000
--- a/graphviz/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: graphviz
diff --git a/gstreamer1.0-plugins-base/install.yaml b/gstreamer1.0-plugins-base/install.yaml
deleted file mode 100644
index d77532ceb..000000000
--- a/gstreamer1.0-plugins-base/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: gstreamer1.0-plugins-base
diff --git a/gstreamer1.0-plugins-good/install.yaml b/gstreamer1.0-plugins-good/install.yaml
deleted file mode 100644
index 6361dae33..000000000
--- a/gstreamer1.0-plugins-good/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: gstreamer1.0-plugins-good
diff --git a/gstreamer1.0-plugins-ugly/install.yaml b/gstreamer1.0-plugins-ugly/install.yaml
deleted file mode 100644
index b1a5ccde4..000000000
--- a/gstreamer1.0-plugins-ugly/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: gstreamer1.0-plugins-ugly
diff --git a/gstreamer1.0/install.yaml b/gstreamer1.0/install.yaml
deleted file mode 100644
index d74a098b4..000000000
--- a/gstreamer1.0/install.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: system
-  name: gstreamer1.0-tools
-
-- type: system
-  name: libgstreamer1.0-0
-
-- type: system
-  name: gir1.2-gstreamer-1.0
diff --git a/gtest/install.yaml b/gtest/install.yaml
deleted file mode 100644
index 6f9bc32bf..000000000
--- a/gtest/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libgtest-dev
diff --git a/hero-dev/install.yaml b/hero-dev/install.yaml
index 7f72ff2a4..a05f9d09a 100644
--- a/hero-dev/install.yaml
+++ b/hero-dev/install.yaml
@@ -10,7 +10,7 @@
 
 # Visualization
 - type: target
-  name: ros-rviz
+  name: rviz
 
 # DATA
 - type: target
@@ -18,7 +18,7 @@
 
 # Diagnostics
 - type: target
-  name: ros-viz
+  name: viz
 
 # -------------------- ROBOCUP --------------------
 
diff --git a/hero-start/install.yaml b/hero-start/install.yaml
index 2a32ce3ce..909948915 100644
--- a/hero-start/install.yaml
+++ b/hero-start/install.yaml
@@ -11,7 +11,7 @@
   name: ros-hero_description
 
 - type: target
-  name: ros-robot_state_publisher
+  name: robot_state_publisher
 
 - type: target
   name: ros-rosbridge_server
diff --git a/imagemagick/install.yaml b/imagemagick/install.yaml
deleted file mode 100644
index adaa8f029..000000000
--- a/imagemagick/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: imagemagick
diff --git a/libblas-dev/install.yaml b/libblas-dev/install.yaml
deleted file mode 100644
index 57b6da8ca..000000000
--- a/libblas-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libblas-dev
diff --git a/libconsole-bridge-dev/install.yaml b/libconsole-bridge-dev/install.yaml
deleted file mode 100644
index 23b9c1f4d..000000000
--- a/libconsole-bridge-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libconsole-bridge-dev
diff --git a/libfftw3/install.yaml b/libfftw3/install.yaml
deleted file mode 100644
index e4a746760..000000000
--- a/libfftw3/install.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: system
-  name: libfftw3-3
-
-- type: system
-  name: libfftw3-dev
diff --git a/libfreenect-dev/install.yaml b/libfreenect-dev/install.yaml
deleted file mode 100644
index 0b2b2ac9e..000000000
--- a/libfreenect-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libfreenect-dev
diff --git a/libglib-dev/install.yaml b/libglib-dev/install.yaml
deleted file mode 100644
index b62989b7a..000000000
--- a/libglib-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libglib2.0-dev
diff --git a/libgsl/install.yaml b/libgsl/install.yaml
deleted file mode 100644
index 67e3cbd85..000000000
--- a/libgsl/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libgsl-dev
diff --git a/libgstreamer-plugins-base1.0-dev/install.yaml b/libgstreamer-plugins-base1.0-dev/install.yaml
deleted file mode 100644
index ac29d021c..000000000
--- a/libgstreamer-plugins-base1.0-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libgstreamer-plugins-base1.0-dev
diff --git a/libgstreamer1.0-dev/install.yaml b/libgstreamer1.0-dev/install.yaml
deleted file mode 100644
index 619afb358..000000000
--- a/libgstreamer1.0-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libgstreamer1.0-dev
diff --git a/libncurses-dev/install.yaml b/libncurses-dev/install.yaml
deleted file mode 100644
index b1ecff31a..000000000
--- a/libncurses-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libncurses5-dev
diff --git a/libnlopt-dev/install.yaml b/libnlopt-dev/install.yaml
deleted file mode 100644
index b94d4edf1..000000000
--- a/libnlopt-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libnlopt-dev
diff --git a/libnlopt0/install.yaml b/libnlopt0/install.yaml
deleted file mode 100644
index 267979b6f..000000000
--- a/libnlopt0/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libnlopt0
diff --git a/libopencv-dev/install.yaml b/libopencv-dev/install.yaml
deleted file mode 100644
index 21f08d5d2..000000000
--- a/libopencv-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libopencv-dev
diff --git a/libpcl-all-dev/install.yaml b/libpcl-all-dev/install.yaml
deleted file mode 100644
index 793f11b9a..000000000
--- a/libpcl-all-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libpcl-dev
diff --git a/libqt5-core/install.yaml b/libqt5-core/install.yaml
deleted file mode 100644
index a750871c7..000000000
--- a/libqt5-core/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libqt5core5a
diff --git a/libqt5-gui/install.yaml b/libqt5-gui/install.yaml
deleted file mode 100644
index 12d65c16f..000000000
--- a/libqt5-gui/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libqt5gui5
diff --git a/libqt5-opengl-dev/install.yaml b/libqt5-opengl-dev/install.yaml
deleted file mode 100644
index b5d67f76a..000000000
--- a/libqt5-opengl-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libqt5opengl5-dev
diff --git a/libqt5-widgets/install.yaml b/libqt5-widgets/install.yaml
deleted file mode 100644
index b343a7033..000000000
--- a/libqt5-widgets/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libqt5widgets5
diff --git a/libreadline-dev/install.yaml b/libreadline-dev/install.yaml
deleted file mode 100644
index 1cbb0ae70..000000000
--- a/libreadline-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libreadline-dev
diff --git a/libsiftfast/install.bash b/libsiftfast/install.bash
deleted file mode 100644
index d1d1e004d..000000000
--- a/libsiftfast/install.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/env bash
-
-if [ ! -f /usr/local/lib/libsiftfast.so ]
-then
-    svn co http://svn.code.sf.net/p/libsift/code/trunk /tmp/libsiftfast
-    mkdir -p /tmp/libsiftfast/build
-    # shellcheck disable=SC2164
-    cd /tmp/libsiftfast/build
-
-    #cd /tmp
-    #wget http://downloads.sourceforge.net/project/libsift/libsiftfast/libsiftfast-1.2/libsiftfast-1.2-src.tgz
-    #tar -xzvf libsiftfast-1.2-src.tgz
-    #mkdir libsiftfast-1.2-src/build
-    #cd libsiftfast-1.2-src/build
-
-    cmake ..
-    make
-    sudo make install
-fi
diff --git a/libsndfile1-dev/install.yaml b/libsndfile1-dev/install.yaml
deleted file mode 100644
index 5214bfa25..000000000
--- a/libsndfile1-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libsndfile1-dev
diff --git a/libtool/install.yaml b/libtool/install.yaml
deleted file mode 100644
index 9cc7833fd..000000000
--- a/libtool/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libtool
diff --git a/liburdfdom-headers-dev/install.yaml b/liburdfdom-headers-dev/install.yaml
deleted file mode 100644
index 4bfb489b7..000000000
--- a/liburdfdom-headers-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: liburdfdom-headers-dev
diff --git a/libxml2/install.yaml b/libxml2/install.yaml
deleted file mode 100644
index 85b6ef646..000000000
--- a/libxml2/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libxml2-dev
diff --git a/lua-dev/install.yaml b/lua-dev/install.yaml
deleted file mode 100644
index 138f25c4c..000000000
--- a/lua-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: liblua5.1-0-dev
diff --git a/metaruby/install.yaml b/metaruby/install.yaml
deleted file mode 100644
index b31f85cf1..000000000
--- a/metaruby/install.yaml
+++ /dev/null
@@ -1 +0,0 @@
-- type: empty
diff --git a/netcdf/install.yaml b/netcdf/install.yaml
deleted file mode 100644
index f596e1f44..000000000
--- a/netcdf/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: netcdf-bin
diff --git a/netpbm/install.yaml b/netpbm/install.yaml
deleted file mode 100644
index 18ae19fa0..000000000
--- a/netpbm/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libnetpbm10-dev
diff --git a/nodejs/install.bash b/nodejs/install.bash
deleted file mode 100644
index 90d422668..000000000
--- a/nodejs/install.bash
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /usr/bin/env bash
-
-if [ ! -f /etc/apt/sources.list.d/nodesource.list ]
-then
-    # increase the amount of file watchers
-    echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-
-    wget -qO- https://deb.nodesource.com/setup_4.x | sudo bash -
-fi
-
-tue-install-system-now nodejs
diff --git a/omniorb/install.yaml b/omniorb/install.yaml
deleted file mode 100644
index 7b746deec..000000000
--- a/omniorb/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: omniorb
diff --git a/pkg-config/install.yaml b/pkg-config/install.yaml
deleted file mode 100644
index 47b6f5702..000000000
--- a/pkg-config/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: pkg-config
diff --git a/portaudio19-dev/install.yaml b/portaudio19-dev/install.yaml
deleted file mode 100644
index 91b611e5e..000000000
--- a/portaudio19-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: portaudio19-dev
diff --git a/pybind11-dev/install.yaml b/pybind11-dev/install.yaml
deleted file mode 100644
index e11132dc7..000000000
--- a/pybind11-dev/install.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: system
-  default:
-    name: pybind11-dev
-  xenial:
-    name: null # No release on xenial
diff --git a/python-astor-pip/install.yaml b/python-astor-pip/install.yaml
deleted file mode 100644
index 5feb49aa3..000000000
--- a/python-astor-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: astor
diff --git a/python-dlib/install.yaml b/python-dlib/install.yaml
deleted file mode 100644
index 888da5ea8..000000000
--- a/python-dlib/install.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- type: pip
-  name: dlib
-
diff --git a/python-graphviz-pip/install.yaml b/python-graphviz-pip/install.yaml
deleted file mode 100644
index 4b298bd97..000000000
--- a/python-graphviz-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: graphviz
diff --git a/python-keras-pip/install.yaml b/python-keras-pip/install.yaml
deleted file mode 100644
index 8de9f0e4e..000000000
--- a/python-keras-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: keras
diff --git a/python-pyaudio/install.yaml b/python-pyaudio/install.yaml
deleted file mode 100644
index 9510efe34..000000000
--- a/python-pyaudio/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python-pyaudio
diff --git a/python-slackclient-pip/install.yaml b/python-slackclient-pip/install.yaml
deleted file mode 100644
index af1a5a674..000000000
--- a/python-slackclient-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: slackclient
diff --git a/python-tensorboard-pip/install.yaml b/python-tensorboard-pip/install.yaml
deleted file mode 100644
index 96003bd0b..000000000
--- a/python-tensorboard-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: tensorboard
diff --git a/python-tensorflow-hub-pip/install.yaml b/python-tensorflow-hub-pip/install.yaml
deleted file mode 100644
index 11de8b337..000000000
--- a/python-tensorflow-hub-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: tensorflow-hub
diff --git a/python-tensorflow-pip/install.yaml b/python-tensorflow-pip/install.yaml
deleted file mode 100644
index 64e1f7bed..000000000
--- a/python-tensorflow-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: tensorflow
diff --git a/python/install.yaml b/python/install.yaml
deleted file mode 100644
index b8f96b616..000000000
--- a/python/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python-dev
diff --git a/python3-autobahn/install.yaml b/python3-autobahn/install.yaml
deleted file mode 100644
index 2171b4830..000000000
--- a/python3-autobahn/install.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- type: system
-  default:
-    name: python3-autobahn
-  xenial:
-    name: null
-
-- type: pip3
-  default:
-    name: null
-  xenial:
-    name: autobahn
diff --git a/python3-bson/install.yaml b/python3-bson/install.yaml
deleted file mode 100644
index 5d65dd00e..000000000
--- a/python3-bson/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-bson
diff --git a/python3-catkin-lint/install.yaml b/python3-catkin-lint/install.yaml
deleted file mode 100644
index 2f38492f4..000000000
--- a/python3-catkin-lint/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-catkin-lint
diff --git a/python3-dbus/install.yaml b/python3-dbus/install.yaml
deleted file mode 100644
index a0c035d18..000000000
--- a/python3-dbus/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-dbus
diff --git a/python3-docopt/install.yaml b/python3-docopt/install.yaml
deleted file mode 100644
index ce25ff720..000000000
--- a/python3-docopt/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-docopt
diff --git a/python3-future/install.yaml b/python3-future/install.yaml
deleted file mode 100644
index 60e693da1..000000000
--- a/python3-future/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-future
diff --git a/python3-markdown/install.yaml b/python3-markdown/install.yaml
deleted file mode 100644
index ec232cce6..000000000
--- a/python3-markdown/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-markdown
diff --git a/python3-matplotlib/install.yaml b/python3-matplotlib/install.yaml
deleted file mode 100644
index 6ec8ae984..000000000
--- a/python3-matplotlib/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-matplotlib
diff --git a/python3-numpy/install.yaml b/python3-numpy/install.yaml
deleted file mode 100644
index dc54d6be6..000000000
--- a/python3-numpy/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-numpy
diff --git a/python3-onnxruntime-gpu-pip/install.yaml b/python3-onnxruntime-gpu-pip/install.yaml
deleted file mode 100644
index ee8341e3f..000000000
--- a/python3-onnxruntime-gpu-pip/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: pip
-  name: onnxruntime-gpu
diff --git a/python3-opencv/install.yaml b/python3-opencv/install.yaml
deleted file mode 100644
index 1333759d6..000000000
--- a/python3-opencv/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-opencv
diff --git a/python3-pandas/install.yaml b/python3-pandas/install.yaml
deleted file mode 100644
index 884446c31..000000000
--- a/python3-pandas/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-pandas
diff --git a/python3-pil/install.yaml b/python3-pil/install.yaml
deleted file mode 100644
index 065385d5a..000000000
--- a/python3-pil/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-pil
diff --git a/python3-psutil/install.yaml b/python3-psutil/install.yaml
deleted file mode 100644
index 43e514786..000000000
--- a/python3-psutil/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-psutil
diff --git a/python3-requests/install.yaml b/python3-requests/install.yaml
deleted file mode 100644
index 400875298..000000000
--- a/python3-requests/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-requests
diff --git a/python3-rospkg/install.yaml b/python3-rospkg/install.yaml
deleted file mode 100644
index 3940bd4b6..000000000
--- a/python3-rospkg/install.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- type: target
-  name: ros-setup
-
-- type: system
-  name: python3-rospkg
diff --git a/python3-scipy/install.yaml b/python3-scipy/install.yaml
deleted file mode 100644
index fc73a5663..000000000
--- a/python3-scipy/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-scipy
diff --git a/python3-setuptools/install.yaml b/python3-setuptools/install.yaml
deleted file mode 100644
index 6b8db7c94..000000000
--- a/python3-setuptools/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-setuptools
diff --git a/python3-six/install.yaml b/python3-six/install.yaml
deleted file mode 100644
index 2eefba07e..000000000
--- a/python3-six/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-six
diff --git a/python3-skimage/install.yaml b/python3-skimage/install.yaml
deleted file mode 100644
index fc1f670f6..000000000
--- a/python3-skimage/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-skimage
diff --git a/python3-sklearn/install.yaml b/python3-sklearn/install.yaml
deleted file mode 100644
index 9f56c94ef..000000000
--- a/python3-sklearn/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-sklearn
diff --git a/python3-sphinx/install.yaml b/python3-sphinx/install.yaml
deleted file mode 100644
index f9ee1dd43..000000000
--- a/python3-sphinx/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-sphinx
diff --git a/python3-tornado/install.yaml b/python3-tornado/install.yaml
deleted file mode 100644
index b90506916..000000000
--- a/python3-tornado/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-tornado
diff --git a/python3-twisted/install.yaml b/python3-twisted/install.yaml
deleted file mode 100644
index 189fc3d56..000000000
--- a/python3-twisted/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-twisted
diff --git a/python3-yaml/install.yaml b/python3-yaml/install.yaml
deleted file mode 100644
index b652a82fe..000000000
--- a/python3-yaml/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-yaml
diff --git a/python3/install.yaml b/python3/install.yaml
deleted file mode 100644
index b5e7a1a78..000000000
--- a/python3/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: python3-dev
diff --git a/qtbase5-dev/install.yaml b/qtbase5-dev/install.yaml
deleted file mode 100644
index 5491edfd0..000000000
--- a/qtbase5-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: qtbase5-dev
diff --git a/rake/install.yaml b/rake/install.yaml
deleted file mode 100644
index 9a9388256..000000000
--- a/rake/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: rake
diff --git a/ros-actionlib/install.yaml b/ros-actionlib/install.yaml
deleted file mode 100644
index 17c16d845..000000000
--- a/ros-actionlib/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: actionlib
diff --git a/ros-actionlib_msgs/install.yaml b/ros-actionlib_msgs/install.yaml
deleted file mode 100644
index f5ac866b2..000000000
--- a/ros-actionlib_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: actionlib-msgs
diff --git a/ros-angles/install.yaml b/ros-angles/install.yaml
deleted file mode 100644
index 4a9a74445..000000000
--- a/ros-angles/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: geometry
diff --git a/ros-ar_track_alvar/install.yaml b/ros-ar_track_alvar/install.yaml
deleted file mode 100644
index 46bebce4f..000000000
--- a/ros-ar_track_alvar/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: ar-track-alvar
diff --git a/ros-arm_kinematics_constraint_aware/install.yaml b/ros-arm_kinematics_constraint_aware/install.yaml
deleted file mode 100644
index 8cf9b75e8..000000000
--- a/ros-arm_kinematics_constraint_aware/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: arm-navigation
diff --git a/ros-audio_capture/install.yaml b/ros-audio_capture/install.yaml
deleted file mode 100644
index 87050695a..000000000
--- a/ros-audio_capture/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: audio-capture
diff --git a/ros-audio_common_msgs/install.yaml b/ros-audio_common_msgs/install.yaml
deleted file mode 100644
index cf33285bb..000000000
--- a/ros-audio_common_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: audio-common-msgs
diff --git a/ros-bfl/install.yaml b/ros-bfl/install.yaml
deleted file mode 100644
index e9e30bb98..000000000
--- a/ros-bfl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: bfl
diff --git a/ros-camera_info_manager/install.yaml b/ros-camera_info_manager/install.yaml
deleted file mode 100644
index 43d67e4d2..000000000
--- a/ros-camera_info_manager/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: camera-info-manager
diff --git a/ros-catkin/install.yaml b/ros-catkin/install.yaml
deleted file mode 100644
index b144929ae..000000000
--- a/ros-catkin/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: catkin
diff --git a/ros-class_loader/install.yaml b/ros-class_loader/install.yaml
deleted file mode 100644
index 3150b5bf7..000000000
--- a/ros-class_loader/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: class-loader
diff --git a/ros-cmake_modules/install.yaml b/ros-cmake_modules/install.yaml
deleted file mode 100644
index 603d3fea9..000000000
--- a/ros-cmake_modules/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: cmake-modules
diff --git a/ros-common_rosdeps/install.yaml b/ros-common_rosdeps/install.yaml
deleted file mode 100644
index aaf8aafbb..000000000
--- a/ros-common_rosdeps/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: common-rosdeps
diff --git a/ros-compressed_image_transport/install.yaml b/ros-compressed_image_transport/install.yaml
deleted file mode 100644
index 8005e36a0..000000000
--- a/ros-compressed_image_transport/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: compressed-image-transport
diff --git a/ros-constraint_aware_spline_smoother/install.yaml b/ros-constraint_aware_spline_smoother/install.yaml
deleted file mode 100644
index 8cf9b75e8..000000000
--- a/ros-constraint_aware_spline_smoother/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: arm-navigation
diff --git a/ros-control_msgs/install.yaml b/ros-control_msgs/install.yaml
deleted file mode 100644
index 9fe5fcb42..000000000
--- a/ros-control_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: control-msgs
diff --git a/ros-control_toolbox/install.yaml b/ros-control_toolbox/install.yaml
deleted file mode 100644
index 1f7dc6624..000000000
--- a/ros-control_toolbox/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: control-toolbox
diff --git a/ros-controller_manager/install.yaml b/ros-controller_manager/install.yaml
deleted file mode 100644
index f008bee5c..000000000
--- a/ros-controller_manager/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: controller-manager
diff --git a/ros-cv_bridge/install.yaml b/ros-cv_bridge/install.yaml
deleted file mode 100644
index 643de0f4e..000000000
--- a/ros-cv_bridge/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: cv-bridge
diff --git a/ros-ddynamic_reconfigure/install.yaml b/ros-ddynamic_reconfigure/install.yaml
deleted file mode 100644
index ce1480848..000000000
--- a/ros-ddynamic_reconfigure/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: ddynamic-reconfigure
diff --git a/ros-depth_image_proc/install.yaml b/ros-depth_image_proc/install.yaml
deleted file mode 100644
index b5715f84c..000000000
--- a/ros-depth_image_proc/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: depth-image-proc
diff --git a/ros-diagnostic_aggregator/install.yaml b/ros-diagnostic_aggregator/install.yaml
deleted file mode 100644
index 33e135f60..000000000
--- a/ros-diagnostic_aggregator/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: diagnostics
diff --git a/ros-diagnostic_msgs/install.yaml b/ros-diagnostic_msgs/install.yaml
deleted file mode 100644
index 85008837c..000000000
--- a/ros-diagnostic_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: diagnostic-msgs
diff --git a/ros-diagnostic_updater/install.yaml b/ros-diagnostic_updater/install.yaml
deleted file mode 100644
index be1d6020c..000000000
--- a/ros-diagnostic_updater/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: diagnostic-updater
diff --git a/ros-dynamic_reconfigure/install.yaml b/ros-dynamic_reconfigure/install.yaml
deleted file mode 100644
index 96ebc2951..000000000
--- a/ros-dynamic_reconfigure/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: dynamic-reconfigure
diff --git a/ros-dynamixel_workbench_toolbox/install.yaml b/ros-dynamixel_workbench_toolbox/install.yaml
deleted file mode 100644
index 939378d63..000000000
--- a/ros-dynamixel_workbench_toolbox/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: dynamixel-workbench-toolbox
diff --git a/ros-effort_controllers/install.yaml b/ros-effort_controllers/install.yaml
deleted file mode 100644
index d349794b9..000000000
--- a/ros-effort_controllers/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: effort-controllers
diff --git a/ros-eigen_conversions/install.yaml b/ros-eigen_conversions/install.yaml
deleted file mode 100644
index 410434dee..000000000
--- a/ros-eigen_conversions/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: eigen-conversions
diff --git a/ros-fcl/install.yaml b/ros-fcl/install.yaml
deleted file mode 100644
index 4e785cfc4..000000000
--- a/ros-fcl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: fcl
diff --git a/ros-filters/install.yaml b/ros-filters/install.yaml
deleted file mode 100644
index 3424ac379..000000000
--- a/ros-filters/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: filters
diff --git a/ros-gazebo_dev/install.yaml b/ros-gazebo_dev/install.yaml
deleted file mode 100644
index 2ab5da0c7..000000000
--- a/ros-gazebo_dev/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: gazebo-dev
diff --git a/ros-gazebo_msgs/install.yaml b/ros-gazebo_msgs/install.yaml
deleted file mode 100644
index b807644bf..000000000
--- a/ros-gazebo_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: gazebo-msgs
diff --git a/ros-gazebo_ros/install.yaml b/ros-gazebo_ros/install.yaml
deleted file mode 100644
index f0362ab4b..000000000
--- a/ros-gazebo_ros/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: gazebo-ros
diff --git a/ros-genmsg/install.yaml b/ros-genmsg/install.yaml
deleted file mode 100644
index ca2bda7e8..000000000
--- a/ros-genmsg/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: genmsg
diff --git a/ros-genpy/install.yaml b/ros-genpy/install.yaml
deleted file mode 100644
index 407047e43..000000000
--- a/ros-genpy/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: genpy
diff --git a/ros-geometry_msgs/install.yaml b/ros-geometry_msgs/install.yaml
deleted file mode 100644
index 3a64166c1..000000000
--- a/ros-geometry_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: geometry-msgs
diff --git a/ros-gmapping/install.yaml b/ros-gmapping/install.yaml
deleted file mode 100644
index 9f93e32b6..000000000
--- a/ros-gmapping/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: slam-gmapping
diff --git a/ros-hardware_interface/install.yaml b/ros-hardware_interface/install.yaml
deleted file mode 100644
index a9f71715b..000000000
--- a/ros-hardware_interface/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: hardware-interface
diff --git a/ros-image_geometry/install.yaml b/ros-image_geometry/install.yaml
deleted file mode 100644
index ff722f99d..000000000
--- a/ros-image_geometry/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: image-geometry
diff --git a/ros-image_transport/install.yaml b/ros-image_transport/install.yaml
deleted file mode 100644
index afb7c1b82..000000000
--- a/ros-image_transport/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: image-transport
diff --git a/ros-image_view/install.yaml b/ros-image_view/install.yaml
deleted file mode 100644
index c1d0509bd..000000000
--- a/ros-image_view/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: image-view
diff --git a/ros-industrial_trajectory_filters/install.yaml b/ros-industrial_trajectory_filters/install.yaml
deleted file mode 100644
index 425ed1827..000000000
--- a/ros-industrial_trajectory_filters/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: industrial-trajectory-filters
diff --git a/ros-interactive_markers/install.yaml b/ros-interactive_markers/install.yaml
deleted file mode 100644
index 0bf8d7486..000000000
--- a/ros-interactive_markers/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: interactive-markers
diff --git a/ros-joint_limits_interface/install.yaml b/ros-joint_limits_interface/install.yaml
deleted file mode 100644
index 9d76b7600..000000000
--- a/ros-joint_limits_interface/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: joint-limits-interface
diff --git a/ros-joint_state_controller/install.yaml b/ros-joint_state_controller/install.yaml
deleted file mode 100644
index 78e469107..000000000
--- a/ros-joint_state_controller/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: joint-state-controller
diff --git a/ros-joint_state_publisher/install.yaml b/ros-joint_state_publisher/install.yaml
deleted file mode 100644
index bf78d3769..000000000
--- a/ros-joint_state_publisher/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: joint-state-publisher
diff --git a/ros-joy/install.yaml b/ros-joy/install.yaml
deleted file mode 100644
index 23f40abdc..000000000
--- a/ros-joy/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: joy
diff --git a/ros-jpl/install.yaml b/ros-jpl/install.yaml
deleted file mode 100644
index b6c67fae5..000000000
--- a/ros-jpl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: knowrob
diff --git a/ros-kdl/install.yaml b/ros-kdl/install.yaml
deleted file mode 100644
index 82ece4028..000000000
--- a/ros-kdl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: kdl
diff --git a/ros-kdl_conversions/install.yaml b/ros-kdl_conversions/install.yaml
deleted file mode 100644
index 64b4bd7f5..000000000
--- a/ros-kdl_conversions/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: kdl-conversions
diff --git a/ros-knowrob_common/install.yaml b/ros-knowrob_common/install.yaml
deleted file mode 100644
index 343b6eafb..000000000
--- a/ros-knowrob_common/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: client-rosjava-jni
diff --git a/ros-knowrob_objects/install.yaml b/ros-knowrob_objects/install.yaml
deleted file mode 100644
index 343b6eafb..000000000
--- a/ros-knowrob_objects/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: client-rosjava-jni
diff --git a/ros-laser_assembler/install.yaml b/ros-laser_assembler/install.yaml
deleted file mode 100644
index 14b183eb9..000000000
--- a/ros-laser_assembler/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: laser-assembler
diff --git a/ros-laser_filters/install.yaml b/ros-laser_filters/install.yaml
deleted file mode 100644
index b5544c4fe..000000000
--- a/ros-laser_filters/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: laser-filters
diff --git a/ros-laser_geometry/install.yaml b/ros-laser_geometry/install.yaml
deleted file mode 100644
index e90032021..000000000
--- a/ros-laser_geometry/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: laser-geometry
diff --git a/ros-map_msgs/install.yaml b/ros-map_msgs/install.yaml
deleted file mode 100644
index 8a935b6b7..000000000
--- a/ros-map_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: map-msgs
diff --git a/ros-message_filters/install.yaml b/ros-message_filters/install.yaml
deleted file mode 100644
index 0026e1b89..000000000
--- a/ros-message_filters/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: message-filters
diff --git a/ros-message_generation/install.yaml b/ros-message_generation/install.yaml
deleted file mode 100644
index 8b9ebc7cb..000000000
--- a/ros-message_generation/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: message-generation
diff --git a/ros-message_runtime/install.yaml b/ros-message_runtime/install.yaml
deleted file mode 100644
index 18ee977e1..000000000
--- a/ros-message_runtime/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: message-runtime
diff --git a/ros-mjpeg_server/install.yaml b/ros-mjpeg_server/install.yaml
deleted file mode 100644
index a93efaf52..000000000
--- a/ros-mjpeg_server/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: mjpeg-server
diff --git a/ros-mod_vis/install.yaml b/ros-mod_vis/install.yaml
deleted file mode 100644
index 343b6eafb..000000000
--- a/ros-mod_vis/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: client-rosjava-jni
diff --git a/ros-move_arm/install.yaml b/ros-move_arm/install.yaml
deleted file mode 100644
index 8cf9b75e8..000000000
--- a/ros-move_arm/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: arm-navigation
diff --git a/ros-move_base_msgs/install.yaml b/ros-move_base_msgs/install.yaml
deleted file mode 100644
index 27ccccee0..000000000
--- a/ros-move_base_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: move-base-msgs
diff --git a/ros-moveit_commander/install.yaml b/ros-moveit_commander/install.yaml
deleted file mode 100644
index 8c60c6590..000000000
--- a/ros-moveit_commander/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-commander
diff --git a/ros-moveit_core/install.yaml b/ros-moveit_core/install.yaml
deleted file mode 100644
index 59a8bef55..000000000
--- a/ros-moveit_core/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-core
diff --git a/ros-moveit_msgs/install.yaml b/ros-moveit_msgs/install.yaml
deleted file mode 100644
index 819934fa9..000000000
--- a/ros-moveit_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-msgs
diff --git a/ros-moveit_planners_ompl/install.yaml b/ros-moveit_planners_ompl/install.yaml
deleted file mode 100644
index 46b34a23a..000000000
--- a/ros-moveit_planners_ompl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-planners-ompl
diff --git a/ros-moveit_plugins/install.yaml b/ros-moveit_plugins/install.yaml
deleted file mode 100644
index 78cebe92d..000000000
--- a/ros-moveit_plugins/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-plugins
diff --git a/ros-moveit_ros_benchmarks/install.yaml b/ros-moveit_ros_benchmarks/install.yaml
deleted file mode 100644
index 896b2f2cd..000000000
--- a/ros-moveit_ros_benchmarks/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-ros-benchmarks
diff --git a/ros-moveit_ros_move_group/install.yaml b/ros-moveit_ros_move_group/install.yaml
deleted file mode 100644
index c1f351337..000000000
--- a/ros-moveit_ros_move_group/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-ros-move-group
diff --git a/ros-moveit_ros_planning/install.yaml b/ros-moveit_ros_planning/install.yaml
deleted file mode 100644
index e37d10fa3..000000000
--- a/ros-moveit_ros_planning/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-ros-planning
diff --git a/ros-moveit_ros_planning_interface/install.yaml b/ros-moveit_ros_planning_interface/install.yaml
deleted file mode 100644
index 42a47a5f0..000000000
--- a/ros-moveit_ros_planning_interface/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-ros-planning-interface
diff --git a/ros-moveit_ros_visualization/install.yaml b/ros-moveit_ros_visualization/install.yaml
deleted file mode 100644
index 3579217b7..000000000
--- a/ros-moveit_ros_visualization/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-ros-visualization
diff --git a/ros-moveit_setup_assistant/install.yaml b/ros-moveit_setup_assistant/install.yaml
deleted file mode 100644
index d382a606f..000000000
--- a/ros-moveit_setup_assistant/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-setup-assistant
diff --git a/ros-moveit_simple_controller_manager/install.yaml b/ros-moveit_simple_controller_manager/install.yaml
deleted file mode 100644
index 6218dd2bf..000000000
--- a/ros-moveit_simple_controller_manager/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: moveit-simple-controller-manager
diff --git a/ros-nav_msgs/install.yaml b/ros-nav_msgs/install.yaml
deleted file mode 100644
index 0d9534237..000000000
--- a/ros-nav_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: nav-msgs
diff --git a/ros-nodelet/install.yaml b/ros-nodelet/install.yaml
deleted file mode 100644
index 2809fcb1b..000000000
--- a/ros-nodelet/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: nodelet
diff --git a/ros-octomap/install.yaml b/ros-octomap/install.yaml
deleted file mode 100644
index 90f3fc88c..000000000
--- a/ros-octomap/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: octomap
diff --git a/ros-octomap_msgs/install.yaml b/ros-octomap_msgs/install.yaml
deleted file mode 100644
index f686c3c3e..000000000
--- a/ros-octomap_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: octomap-msgs
diff --git a/ros-octomap_ros/install.yaml b/ros-octomap_ros/install.yaml
deleted file mode 100644
index ed49d4653..000000000
--- a/ros-octomap_ros/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: octomap-ros
diff --git a/ros-ompl/install.yaml b/ros-ompl/install.yaml
deleted file mode 100644
index 30f8a535b..000000000
--- a/ros-ompl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: ompl
diff --git a/ros-ompl_ros_interface/install.yaml b/ros-ompl_ros_interface/install.yaml
deleted file mode 100644
index 8cf9b75e8..000000000
--- a/ros-ompl_ros_interface/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: arm-navigation
diff --git a/ros-openni_launch/install.yaml b/ros-openni_launch/install.yaml
deleted file mode 100644
index 5e64885db..000000000
--- a/ros-openni_launch/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: openni-launch
diff --git a/ros-pcl_conversions/install.yaml b/ros-pcl_conversions/install.yaml
deleted file mode 100644
index 8723536ff..000000000
--- a/ros-pcl_conversions/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: pcl-conversions
diff --git a/ros-pcl_ros/install.yaml b/ros-pcl_ros/install.yaml
deleted file mode 100644
index 7840b21c9..000000000
--- a/ros-pcl_ros/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: pcl-ros
diff --git a/ros-people_msgs/install.yaml b/ros-people_msgs/install.yaml
deleted file mode 100644
index 3a17829b0..000000000
--- a/ros-people_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: people-msgs
diff --git a/ros-planning_environment/install.yaml b/ros-planning_environment/install.yaml
deleted file mode 100644
index 8cf9b75e8..000000000
--- a/ros-planning_environment/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: arm-navigation
diff --git a/ros-pluginlib/install.yaml b/ros-pluginlib/install.yaml
deleted file mode 100644
index e85d3c1d6..000000000
--- a/ros-pluginlib/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: pluginlib
diff --git a/ros-polled_camera/install.yaml b/ros-polled_camera/install.yaml
deleted file mode 100644
index b20b52fc4..000000000
--- a/ros-polled_camera/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: polled-camera
diff --git a/ros-pr2_dashboard/install.yaml b/ros-pr2_dashboard/install.yaml
deleted file mode 100644
index e0a1cada6..000000000
--- a/ros-pr2_dashboard/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: pr2-gui
diff --git a/ros-pr2_msgs/install.yaml b/ros-pr2_msgs/install.yaml
deleted file mode 100644
index 702692666..000000000
--- a/ros-pr2_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: pr2-common
diff --git a/ros-pr2_power_board/install.yaml b/ros-pr2_power_board/install.yaml
deleted file mode 100644
index f2cda1008..000000000
--- a/ros-pr2_power_board/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: pr2-power-drivers
diff --git a/ros-python_qt_binding/install.yaml b/ros-python_qt_binding/install.yaml
deleted file mode 100644
index ac6ffee23..000000000
--- a/ros-python_qt_binding/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: python-qt-binding
diff --git a/ros-realtime_tools/install.yaml b/ros-realtime_tools/install.yaml
deleted file mode 100644
index 8574f080f..000000000
--- a/ros-realtime_tools/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: realtime-tools
diff --git a/ros-resource_retriever/install.yaml b/ros-resource_retriever/install.yaml
deleted file mode 100644
index 5f3a76a9a..000000000
--- a/ros-resource_retriever/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: resource-retriever
diff --git a/ros-robot_monitor/install.yaml b/ros-robot_monitor/install.yaml
deleted file mode 100644
index 2d67d2c71..000000000
--- a/ros-robot_monitor/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: diagnostics-monitors
diff --git a/ros-robot_state_publisher/install.yaml b/ros-robot_state_publisher/install.yaml
deleted file mode 100644
index 89a0cc3fc..000000000
--- a/ros-robot_state_publisher/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: robot-state-publisher
diff --git a/ros-ros_control_boilerplate/install.yaml b/ros-ros_control_boilerplate/install.yaml
deleted file mode 100644
index cd27f7e06..000000000
--- a/ros-ros_control_boilerplate/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: ros-control-boilerplate
diff --git a/ros-rosauth/install.yaml b/ros-rosauth/install.yaml
deleted file mode 100644
index de97f36d3..000000000
--- a/ros-rosauth/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosauth
diff --git a/ros-rosbag/install.yaml b/ros-rosbag/install.yaml
deleted file mode 100644
index b79a019cf..000000000
--- a/ros-rosbag/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosbag
diff --git a/ros-rosbag_storage/install.yaml b/ros-rosbag_storage/install.yaml
deleted file mode 100644
index b739b20a5..000000000
--- a/ros-rosbag_storage/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosbag-storage
diff --git a/ros-rosconsole/install.yaml b/ros-rosconsole/install.yaml
deleted file mode 100644
index e824bfcfc..000000000
--- a/ros-rosconsole/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosconsole
diff --git a/ros-rosconsole_bridge/install.yaml b/ros-rosconsole_bridge/install.yaml
deleted file mode 100644
index b7304227b..000000000
--- a/ros-rosconsole_bridge/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosconsole-bridge
diff --git a/ros-roscpp/install.yaml b/ros-roscpp/install.yaml
deleted file mode 100644
index 611dd5f84..000000000
--- a/ros-roscpp/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: roscpp
diff --git a/ros-rosgraph/install.yaml b/ros-rosgraph/install.yaml
deleted file mode 100644
index 56a7de099..000000000
--- a/ros-rosgraph/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosgraph
diff --git a/ros-rosgraph_msgs/install.yaml b/ros-rosgraph_msgs/install.yaml
deleted file mode 100644
index 57e703b05..000000000
--- a/ros-rosgraph_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosgraph-msgs
diff --git a/ros-rosjava_jni/install.yaml b/ros-rosjava_jni/install.yaml
deleted file mode 100644
index 343b6eafb..000000000
--- a/ros-rosjava_jni/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: client-rosjava-jni
diff --git a/ros-roslaunch/install.yaml b/ros-roslaunch/install.yaml
deleted file mode 100644
index 75ecb187c..000000000
--- a/ros-roslaunch/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: roslaunch
diff --git a/ros-roslib/install.yaml b/ros-roslib/install.yaml
deleted file mode 100644
index ff4fd796f..000000000
--- a/ros-roslib/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: roslib
diff --git a/ros-roslint/install.yaml b/ros-roslint/install.yaml
deleted file mode 100644
index af17ec053..000000000
--- a/ros-roslint/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: roslint
diff --git a/ros-rosnode/install.yaml b/ros-rosnode/install.yaml
deleted file mode 100644
index d23be7293..000000000
--- a/ros-rosnode/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosnode
diff --git a/ros-rospack/install.yaml b/ros-rospack/install.yaml
deleted file mode 100644
index bfa898825..000000000
--- a/ros-rospack/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rospack
diff --git a/ros-rospy/install.yaml b/ros-rospy/install.yaml
deleted file mode 100644
index 57596dfc1..000000000
--- a/ros-rospy/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rospy
diff --git a/ros-rospy_tutorials/install.yaml b/ros-rospy_tutorials/install.yaml
deleted file mode 100644
index a13258bb4..000000000
--- a/ros-rospy_tutorials/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rospy-tutorials
diff --git a/ros-rosserial-python/install.yaml b/ros-rosserial-python/install.yaml
deleted file mode 100644
index c451e1949..000000000
--- a/ros-rosserial-python/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosserial-python
diff --git a/ros-rosservice/install.yaml b/ros-rosservice/install.yaml
deleted file mode 100644
index b75b3f2c4..000000000
--- a/ros-rosservice/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosservice
diff --git a/ros-rostest/install.yaml b/ros-rostest/install.yaml
deleted file mode 100644
index e1a8c51e2..000000000
--- a/ros-rostest/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rostest
diff --git a/ros-rostime/install.yaml b/ros-rostime/install.yaml
deleted file mode 100644
index c69c6c0b5..000000000
--- a/ros-rostime/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rostime
diff --git a/ros-rostopic/install.yaml b/ros-rostopic/install.yaml
deleted file mode 100644
index 71f6a4b1f..000000000
--- a/ros-rostopic/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rostopic
diff --git a/ros-rosunit/install.yaml b/ros-rosunit/install.yaml
deleted file mode 100644
index 10e6d4c13..000000000
--- a/ros-rosunit/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rosunit
diff --git a/ros-rqt_gui/install.yaml b/ros-rqt_gui/install.yaml
deleted file mode 100644
index f851500ab..000000000
--- a/ros-rqt_gui/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rqt-gui
diff --git a/ros-rqt_gui_py/install.yaml b/ros-rqt_gui_py/install.yaml
deleted file mode 100644
index 91c9760de..000000000
--- a/ros-rqt_gui_py/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rqt-gui-py
diff --git a/ros-rqt_robot_monitor/install.yaml b/ros-rqt_robot_monitor/install.yaml
deleted file mode 100644
index d4bd2d037..000000000
--- a/ros-rqt_robot_monitor/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rqt-robot-monitor
diff --git a/ros-rtt_ros_comm/install.yaml b/ros-rtt_ros_comm/install.yaml
deleted file mode 100644
index 6d63b0fbe..000000000
--- a/ros-rtt_ros_comm/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rtt-ros-comm
diff --git a/ros-rviz/install.yaml b/ros-rviz/install.yaml
deleted file mode 100644
index 5d1065af0..000000000
--- a/ros-rviz/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rviz
diff --git a/ros-rxtools/install.yaml b/ros-rxtools/install.yaml
deleted file mode 100644
index 43310cc8f..000000000
--- a/ros-rxtools/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: rx
diff --git a/ros-sensor_msgs/install.yaml b/ros-sensor_msgs/install.yaml
deleted file mode 100644
index ac0db4c99..000000000
--- a/ros-sensor_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: sensor-msgs
diff --git a/ros-shape_msgs/install.yaml b/ros-shape_msgs/install.yaml
deleted file mode 100644
index f1b0e7b9c..000000000
--- a/ros-shape_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: shape-msgs
diff --git a/ros-soem/install.yaml b/ros-soem/install.yaml
deleted file mode 100644
index f90c9d64e..000000000
--- a/ros-soem/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: soem
diff --git a/ros-std_msgs/install.yaml b/ros-std_msgs/install.yaml
deleted file mode 100644
index 8aa745e8d..000000000
--- a/ros-std_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: std-msgs
diff --git a/ros-std_srvs/install.yaml b/ros-std_srvs/install.yaml
deleted file mode 100644
index d0f9b6f2c..000000000
--- a/ros-std_srvs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: std-srvs
diff --git a/ros-stereo_msgs/install.yaml b/ros-stereo_msgs/install.yaml
deleted file mode 100644
index e934ef7b3..000000000
--- a/ros-stereo_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: stereo-msgs
diff --git a/ros-swri_console/install.yaml b/ros-swri_console/install.yaml
deleted file mode 100644
index b51f5f1cc..000000000
--- a/ros-swri_console/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: swri-console
diff --git a/ros-tf/install.yaml b/ros-tf/install.yaml
deleted file mode 100644
index 5e80080ef..000000000
--- a/ros-tf/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf
diff --git a/ros-tf2/install.yaml b/ros-tf2/install.yaml
deleted file mode 100644
index 46c2488c0..000000000
--- a/ros-tf2/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2
diff --git a/ros-tf2_eigen/install.yaml b/ros-tf2_eigen/install.yaml
deleted file mode 100644
index 01a5fa814..000000000
--- a/ros-tf2_eigen/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-eigen
diff --git a/ros-tf2_geometry_msgs/install.yaml b/ros-tf2_geometry_msgs/install.yaml
deleted file mode 100644
index 27bbb2d11..000000000
--- a/ros-tf2_geometry_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-geometry-msgs
diff --git a/ros-tf2_kdl/install.yaml b/ros-tf2_kdl/install.yaml
deleted file mode 100644
index d337fed43..000000000
--- a/ros-tf2_kdl/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-kdl
diff --git a/ros-tf2_msgs/install.yaml b/ros-tf2_msgs/install.yaml
deleted file mode 100644
index 0871a5efd..000000000
--- a/ros-tf2_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-msgs
diff --git a/ros-tf2_py/install.yaml b/ros-tf2_py/install.yaml
deleted file mode 100644
index 956c34008..000000000
--- a/ros-tf2_py/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-py
diff --git a/ros-tf2_ros/install.yaml b/ros-tf2_ros/install.yaml
deleted file mode 100644
index 1ffa5a0c1..000000000
--- a/ros-tf2_ros/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-ros
diff --git a/ros-tf2_sensor_msgs/install.yaml b/ros-tf2_sensor_msgs/install.yaml
deleted file mode 100644
index b828e6456..000000000
--- a/ros-tf2_sensor_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-sensor-msgs
diff --git a/ros-tf2_web_republisher/install.yaml b/ros-tf2_web_republisher/install.yaml
deleted file mode 100644
index c6327b809..000000000
--- a/ros-tf2_web_republisher/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf2-web-republisher
diff --git a/ros-tf_conversions/install.yaml b/ros-tf_conversions/install.yaml
deleted file mode 100644
index c3b2d28c8..000000000
--- a/ros-tf_conversions/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: tf-conversions
diff --git a/ros-topic_tools/install.yaml b/ros-topic_tools/install.yaml
deleted file mode 100644
index 4c3d48c74..000000000
--- a/ros-topic_tools/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: topic-tools
diff --git a/ros-trajectory_filter_server/install.yaml b/ros-trajectory_filter_server/install.yaml
deleted file mode 100644
index 8cf9b75e8..000000000
--- a/ros-trajectory_filter_server/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: arm-navigation
diff --git a/ros-trajectory_msgs/install.yaml b/ros-trajectory_msgs/install.yaml
deleted file mode 100644
index dfe0ec527..000000000
--- a/ros-trajectory_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: common-msgs
diff --git a/ros-transmission_interface/install.yaml b/ros-transmission_interface/install.yaml
deleted file mode 100644
index 7eed0633b..000000000
--- a/ros-transmission_interface/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: transmission-interface
diff --git a/ros-urdf/install.yaml b/ros-urdf/install.yaml
deleted file mode 100644
index 8e32782c2..000000000
--- a/ros-urdf/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: urdf
diff --git a/ros-urg_node/install.yaml b/ros-urg_node/install.yaml
deleted file mode 100644
index 54df87dc7..000000000
--- a/ros-urg_node/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: urg-node
diff --git a/ros-usb_cam/install.yaml b/ros-usb_cam/install.yaml
deleted file mode 100644
index ceee13526..000000000
--- a/ros-usb_cam/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: usb-cam
diff --git a/ros-visualization_msgs/install.yaml b/ros-visualization_msgs/install.yaml
deleted file mode 100644
index f5c31a6ad..000000000
--- a/ros-visualization_msgs/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: visualization-msgs
diff --git a/ros-viz/install.yaml b/ros-viz/install.yaml
deleted file mode 100644
index cc4076970..000000000
--- a/ros-viz/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: viz
diff --git a/ros-web_video_server/install.yaml b/ros-web_video_server/install.yaml
deleted file mode 100644
index a7cf5b311..000000000
--- a/ros-web_video_server/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: web-video-server
diff --git a/ros-xacro/install.yaml b/ros-xacro/install.yaml
deleted file mode 100644
index 2ca02a0ae..000000000
--- a/ros-xacro/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: xacro
diff --git a/ros-xmlrpcpp/install.yaml b/ros-xmlrpcpp/install.yaml
deleted file mode 100644
index efdea3851..000000000
--- a/ros-xmlrpcpp/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: xmlrpcpp
diff --git a/ros-zbar_ros/install.yaml b/ros-zbar_ros/install.yaml
deleted file mode 100644
index 415f2cee6..000000000
--- a/ros-zbar_ros/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: ros
-  source:
-    type: system
-    name: zbar-ros
diff --git a/ruby-backports/install.yaml b/ruby-backports/install.yaml
deleted file mode 100644
index 12405ef27..000000000
--- a/ruby-backports/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: ruby-backports
diff --git a/ruby-dev/install.yaml b/ruby-dev/install.yaml
deleted file mode 100644
index d286f830f..000000000
--- a/ruby-dev/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: ruby-dev
diff --git a/ruby/install.yaml b/ruby/install.yaml
deleted file mode 100644
index f09eecbfc..000000000
--- a/ruby/install.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- type: system
-  name: ruby
-- type: target
-  name: ruby-dev
diff --git a/sdformat/install.yaml b/sdformat/install.yaml
deleted file mode 100644
index e6c97923d..000000000
--- a/sdformat/install.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: target
-  name: gazebo-setup
-
-- type: system
-  default:
-    name: libsdformat6-dev
-  xenial:
-    name: libsdformat4-dev
diff --git a/sdl-image/install.yaml b/sdl-image/install.yaml
deleted file mode 100644
index 97b429c6b..000000000
--- a/sdl-image/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libsdl-image1.2-dev
diff --git a/sdl/install.yaml b/sdl/install.yaml
deleted file mode 100644
index ecdf60850..000000000
--- a/sdl/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libsdl1.2-dev
diff --git a/sergio-start/install.yaml b/sergio-start/install.yaml
index fc21f3d35..09ef58c3d 100644
--- a/sergio-start/install.yaml
+++ b/sergio-start/install.yaml
@@ -11,7 +11,7 @@
   name: ros-sergio_description
 
 - type: target
-  name: ros-robot_state_publisher
+  name: robot_state_publisher
 
 - type: target
   name: ros-rosbridge_server
diff --git a/sox/install.yaml b/sox/install.yaml
deleted file mode 100644
index 2ddfde328..000000000
--- a/sox/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: sox
diff --git a/subversion/install.yaml b/subversion/install.yaml
deleted file mode 100644
index 35845b8da..000000000
--- a/subversion/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: subversion
diff --git a/swi-prolog/install.yaml b/swi-prolog/install.yaml
deleted file mode 100644
index 7d76ce556..000000000
--- a/swi-prolog/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: swi-prolog
diff --git a/swi-prolog/ros-swi-prolog/install.yaml b/swi-prolog/ros-swi-prolog/install.yaml
deleted file mode 100644
index 7d76ce556..000000000
--- a/swi-prolog/ros-swi-prolog/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: swi-prolog
diff --git a/swig/install.yaml b/swig/install.yaml
deleted file mode 100644
index 71b29a189..000000000
--- a/swig/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: swig
diff --git a/tinyxml/install.yaml b/tinyxml/install.yaml
deleted file mode 100644
index 95bf0ec34..000000000
--- a/tinyxml/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libtinyxml-dev
diff --git a/tinyxml2/install.yaml b/tinyxml2/install.yaml
deleted file mode 100644
index 4b581c6a8..000000000
--- a/tinyxml2/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libtinyxml2-dev
diff --git a/tmux/install.yaml b/tmux/install.yaml
deleted file mode 100644
index 179ef2d4c..000000000
--- a/tmux/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: tmux
diff --git a/tue-dev/install.yaml b/tue-dev/install.yaml
index 92e936774..4729998e8 100644
--- a/tue-dev/install.yaml
+++ b/tue-dev/install.yaml
@@ -12,7 +12,7 @@
 
 # Visualization
 - type: target
-  name: ros-rviz
+  name: rviz
 
 # DATA
 - type: target
diff --git a/tue-middleware/install.yaml b/tue-middleware/install.yaml
index bd3a3ef70..91f413025 100644
--- a/tue-middleware/install.yaml
+++ b/tue-middleware/install.yaml
@@ -3,7 +3,7 @@
   name: tue-common
 
 - type: target
-  name: ros-diagnostic_aggregator
+  name: diagnostic_aggregator
 
 - type: target
   name: ros-node_alive
@@ -20,7 +20,7 @@
 
 # SLAM
 - type: target
-  name: ros-gmapping
+  name: gmapping
 
 # World model
 - type: target
diff --git a/v4l-utils/install.yaml b/v4l-utils/install.yaml
deleted file mode 100644
index 87d9cc93f..000000000
--- a/v4l-utils/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: v4l-utils
diff --git a/wget/install.yaml b/wget/install.yaml
deleted file mode 100644
index d8b5bbe71..000000000
--- a/wget/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: wget
diff --git a/wireshark/install.bash b/wireshark/install.bash
deleted file mode 100755
index b81984265..000000000
--- a/wireshark/install.bash
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-
-sudo dpkg-reconfigure wireshark-common
diff --git a/wireshark/install.yaml b/wireshark/install.yaml
deleted file mode 100644
index e318c4abe..000000000
--- a/wireshark/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: wireshark
diff --git a/xpath-perl/install.yaml b/xpath-perl/install.yaml
deleted file mode 100644
index 2fae57e8c..000000000
--- a/xpath-perl/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libxml-xpath-perl
diff --git a/yaml-cpp/install.yaml b/yaml-cpp/install.yaml
deleted file mode 100644
index dd8d65337..000000000
--- a/yaml-cpp/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libyaml-cpp-dev
diff --git a/zbar/install.yaml b/zbar/install.yaml
deleted file mode 100644
index 7e9f3cfee..000000000
--- a/zbar/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: libzbar-dev
diff --git a/zlib/install.yaml b/zlib/install.yaml
deleted file mode 100644
index 9d22c875e..000000000
--- a/zlib/install.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- type: system
-  name: zlib1g-dev