Updating Websocket support, cleaning up