Preferences cleanup part 1