demo fixes + cleanup
Bluetooth service demo