usrp: Cleanup for merge of bitshark daughterboard code