remove unnecessary error handling
pep8
Merge pull request #3598 from dimagi/clean-up-formdata-model

Clean up formdata model