Cleaned up XMPP delegate calls