TODO: journal enhancements
TODO: remove dbus items which we will not touch anymore