remove unused stuff
Merge pull request #1733 from dimagi/cleanup

remove unused stuff