FLUID-4927: removed some model munging

Removed the code that pulls in the options for the names and values of a selection from the options block into the model. Rather we now reference the options directly in the produce tree.