Remove duplicate properties during store migration from 2.1 to 2.2

That would make a long line. I like breaking things out.