Cleanup all other returners to handle the new passed_jid argument