CFY-1849 code cleanup
CFY-1849 remove wait for counts