Merge "Remove update_extra_routes()"