Lots of extra code for safer S3 deletes - UGH!