Cleanup Temp BT Changes

Change-Id: I77a6ece4fd08065f6b3d7385a4b27e8fe78552d3