more cleanup on new web socket code