Remove duplicate properties during store migration from 2.1 to 2.2

It's not going to make any difference, but yeah, let's do that.