Remove unnecessary nested form elements
Merge pull request #650 from hudmol/merge-form-fix

Remove unnecessary nested form elements