Remove websocket based logic