Cleaned up s3client