Changes for radio

Change-Id: Ibb91ef34915e3fab4e3f0ff1766ddcc287683b77
Radio fixes and cleanup

Change-Id: I9cac0c3f05aed76f208fe6ee4f9cd288376d12a2