tiny misc cleanup
Merge pull request #4218 from dimagi/cz

tiny misc cleanup