am 8c8c9927: prefs cleanup

* commit '8c8c9927c5b1ec2cb26ee20c3e755121723b979b':
  prefs cleanup