Some pre-gsettings-migration cleanup