Jabber code cleanup