remove/move code that moved

depends on https://github.com/dimagi/casexml/pull/42