Remove duplicate properties during store migration from 2.1 to 2.2

It would be nice to have a small unit test for this class.