bluetooth: clean-up

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