fix conditions from QA
remove debugging statements
Merge pull request #3934 from dimagi/iterate-qa-opm

fix conditions after QA