comment out s3 uses/references