Some cleanup
Actually handle websocket close request