Remove all websocket related part + fix sql part