removed excess fieldmap logic from factory and buildFormInputs