WIP switching branches
removed commented out code. changed s3 build config