Temporary remove for websocket