Slightly better handling of failed deletes but it's still a bit buggy