Remove old preferences keys on upgrade
Merge pull request #611 from illarionov/removeOldPrefsKeys

Remove old preferences keys on upgrade