Merge "Remove Preferences class"