Removed refs to serverId in peer_socket
Event broker is and query for it is only using appName