refactoring: reduced complexity in labelling form builder
removed unused presence_required?()
Merge pull request #469 from ministryofjustice/refactor-form-builder

Refactor form builder