Cleanup, not functional change intended.

Change-Id: Icc23e0fa5059be7b41c58d8b49c957d6702d8fc1
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Remove now superfluous tool, replaced by devtool.

Change-Id: I987722065d65704e9df4864df3232911c9d9747a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>