Merge "Remove unused _delete_router()"