Remove duplicate properties during store migration from 2.1 to 2.2

What about checking first the flag and after that perhaps doing some more expensive check?