Cleanup, add BT and RIL patches