vanishingly minor changes
Merge pull request #669 from dimagi/cleanup

vanishingly minor changes