Updated for changed XMPP API
Removed useless stuff