bluetooth: clean-up

This currently causes build errors. Investigate later, if needed.

Change-Id: I0f83e3315a114982eb8d7a0adba4689dd2540a99