Attempt another delete method: last one did not work on S3
Minor cleanup