Clean up default pref code