re #18 - cleanup
re #18 - use websocket for working with servers