Remove S3 references