Comment out s3 related stuff