Merge "Clean up variables when closing BT"