Trimmed and cleaned up some rmt and tcp-transport code in prep for rip up and retry