Remove duplicate properties during store migration from 2.1 to 2.2

Maybe remove this comment after having inlined the variable?