Merge "Delete CodeItemIterator"