clean up imports
Merge pull request #1203 from dimagi/cleanup

clean up imports