get websocket autorization working again, clear out cruft, and add accountId to websocket handle in server