Clean/fix web socket workflow