Remove using iterator to avoid cme