Remove duplicate properties during store migration from 2.1 to 2.2

what about moving initialization and increment of <code>currentRecordId</code> in the for loop?