Feature/deleteretry