Cleanup XMPP PR