update all models to use new s3 local vars
remove s3.yml to use local vars instead