Merge "Remove delete_extra_routes()"