fix import and cleanup
Merge pull request #11 from dimagi/cz

fix import and cleanup