more cleanup work on imczmq