CQ containment check cleaned up