Remove unused ComboPreferences cruft.

Change-Id: Ib2e005e00316f8840e29fb559e34c6a5d9f28950
10 files changed