Removing choiceOther from industry.
Fixing various conditional fields.