Remove trailing whitespace
Move websocket client to websocket transport
Check if unique_id is None explicitly