Remove duplicate properties during store migration from 2.1 to 2.2

Why not moving the for on labels to be the outermost, so we can remove this extra if?