Add better conversation / connector removal to routing table helper and use it instead of our previous attempt (reviewed by jerith).