minor incidental cleanup while looking at validation
Merge pull request #775 from dimagi/validation-cleanup

Validation cleanup