few d-bus cleanups