Remove stuff
Polishing web socket stuff