Remove obsolete dbus
Reintroduce CM stuff
Sync with remote changes