TOOLS: cleanups
TOOLS: cleanups

GNOME/beast,tim-janik/beast,GNOME/beast,swesterfeld/beast,GNOME/beast,tim-janik/beast,tim-janik/beast,tim-janik/beast,GNOME/beast,GNOME/beast,swesterfeld/beast,tim-janik/beast,swesterfeld/beast,GNOME/beast,swesterfeld/beast,tim-janik/beast,swesterfeld/beast,swesterfeld/beast,tim-janik/beast,swesterfeld/beast,GNOME/beast