removing old control and dbus code