delete unused code
Merge branch 'master' into random-cleanup
Merge pull request #536 from dimagi/random-cleanup

delete unused code