Cleanup BT LPM, FM code cleanup

Change-Id: Ie411b4061dc04835cac5f0e20918a51306ca39b3