Should this be `.add_cleanup`?