Remove model flag for variables

Use an explicit map from variables to model values instead
Do not assign non-present variables