Switch to not using S3