misc cleanups: get rid of bluez