remove/move code that moved
Merge pull request #887 from dimagi/cz

remove/move code that moved