Improve deletions with retry support