small issue around _remove_destination duck typing, I worked around, please review.