clean: websocket cleanTS
Merge branch 'clean_ts' into develop