cleaned up s3 access