some cleanup
Merge pull request #786 from dimagi/orgscleanup

some cleanup