Add bt config, wifi cleanup

Change-Id: Icee497396e5783d16795b4d41a801aa52e6ee8bb