Remove XMPP - second try