Remove leftover S3 references