Remove duplicate properties during store migration from 2.1 to 2.2

It has to be final for the anonymous inner class, but moving it down there makes a lot of sense.