Comment out S3 code