remove the last remaining calls to add_relationship