Remove more references to s3 buckets