Clean up a bit, remove commented out code from other transports.