Bluetooth cleanup

Change-Id: If251275576e69136530e151221e9f2c145f98b54