Remove duplicate properties during store migration from 2.1 to 2.2

while->for loop, so you can initialize and increment <code>currentPageId</code>?