further cleanup of websocketTransport