Now using delete_on_success column