clean up stale code
fix errant pull request that added hard salt dep to raet
fixed other part of errant commit that added hard dep of salt to raet
Merge pull request #11545 from SmithSamuelM/sam_raet_31

Clean up stale code and revert 59410a6db3a8e80cfd335bc633ab292a78042a19  which broke raet udp