Remove duplicate properties during store migration from 2.1 to 2.2

<code>ListIterator</code>-><code>Iterator</code>?