Preferences cleanup part 2