Issue #281: Fixes Retry Mechanism for Deletions