WIP on websocket / Cleanup