Improve wording and remove XMPP