random cleanup
Merge pull request #3177 from dimagi/cz

random cleanup