random cleanup
Merge pull request #1241 from dimagi/random-cleanup

random cleanup