Final changes and cleanup for new pref storage