Adding s3_cleanup back in as it disappeared
Version bump to 0.0.16