removed hard-coded variables in goal calls:

this probably didn't overwrite the inputs in the goals.csv files for each scenario, but best to clean up. I will re-run all scenarios.