Add 'clean' replacement
Trying to export DBUS_SESSION manually
Add stuff