cleanup decaying code in providers/social/xmpp