More clean up for ril and telephony