Cleaning up
Cleaning up
Cleaning up
Cleaning up websocket code