Transceiver cleanup

related to #95 and #117