diff --git a/rtdata/languages/default b/rtdata/languages/default
index d6368127d..894d513f0 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1319,7 +1319,7 @@ TP_COLORAPP_LABEL_VIEWING;Viewing Conditions
 TP_COLORAPP_LIGHT;Lightness (J)
 TP_COLORAPP_LIGHT_TOOLTIP;Lightness in CIECAM02 differs from L*a*b* and RGB lightness.
 TP_COLORAPP_MODEL;WP Model
-TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\n<b>WB [RT] + [output]</b>: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in <i>Preferences > Color Management</i>.\n\n<b>WB [RT+CAT02] + [output]</b>: RT's white balance settings are used by CAT02 and the output device's white balance is set in <i>Preferences - Color Management</i>.
+TP_COLORAPP_MODEL_TOOLTIP;White-Point Model.\n\n<b>WB [RT] + [output]</b>: RT's white balance is used for the scene, CIECAM02 is set to D50, and the output device's white balance is set in Viewing Conditions.\n\n<b>WB [RT+CAT02] + [output]</b>: RT's white balance settings are used by CAT02 and the output device's white balance is set in Viewing Conditions.
 TP_COLORAPP_RSTPRO;Red & skin-tones protection
 TP_COLORAPP_RSTPRO_TOOLTIP;Red and skin-tones protection affects both sliders and curves.
 TP_COLORAPP_SHARPCIE;--unused--
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 07b0f81ad..9fa47b226 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -640,8 +640,8 @@ void Options::setDefaults ()
 #else
     rtSettings.iccDirectory = "/usr/share/color/icc";
 #endif
-    rtSettings.viewingdevice = 0;
-    rtSettings.viewingdevicegrey = 3;
+ //   rtSettings.viewingdevice = 0;
+ //   rtSettings.viewingdevicegrey = 3;
     rtSettings.viewinggreySc = 1;
     rtSettings.leveldnv = 2;
     rtSettings.leveldnti = 0;
@@ -1546,7 +1546,7 @@ int Options::readFromFile (Glib::ustring fname)
                 if (keyFile.has_key ("Color Management", "DenoiseLabgamma")) {
                     rtSettings.denoiselabgamma      = keyFile.get_integer ("Color Management", "DenoiseLabgamma");
                 }
-
+/*
                 if (keyFile.has_key ("Color Management", "view")) {
                     rtSettings.viewingdevice        = keyFile.get_integer ("Color Management", "view");
                 }
@@ -1554,7 +1554,7 @@ int Options::readFromFile (Glib::ustring fname)
                 if (keyFile.has_key ("Color Management", "grey")) {
                     rtSettings.viewingdevicegrey    = keyFile.get_integer ("Color Management", "grey");
                 }
-
+*/
                 if (keyFile.has_key ("Color Management", "greySc")) {
                     rtSettings.viewinggreySc        = keyFile.get_integer ("Color Management", "greySc");
                 }
@@ -2123,8 +2123,8 @@ int Options::saveToFile (Glib::ustring fname)
         keyFile.set_boolean ("Color Management", "RGBcurvesLumamode_Gamut", rtSettings.rgbcurveslumamode_gamut);
         keyFile.set_integer ("Color Management", "Intent", rtSettings.monitorIntent);
         keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC);
-        keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
-        keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
+ //       keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
+ //       keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
         keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc);
 
         keyFile.set_string  ("Color Management", "AdobeRGB", rtSettings.adobe);
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index fd953e158..2f9ab7f1a 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -847,14 +847,14 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
 
     //-------------------------  CIECAM ----------------------
 
-    Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START));
-    setExpandAlignProperties (viewlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+  //  Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START));
+  //  setExpandAlignProperties (viewlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
 
-    view = Gtk::manage (new Gtk::ComboBoxText ());
-    setExpandAlignProperties (view, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+  //  view = Gtk::manage (new Gtk::ComboBoxText ());
+ //   setExpandAlignProperties (view, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
 //    view->append (M("PREFERENCES_D50_MENU"));
 
-    view->append (M ("PREFERENCES_D50"));
+ //   view->append (M ("PREFERENCES_D50"));
 //   view->append (M("PREFERENCES_D55"));
 //   view->append (M("PREFERENCES_D60"));
 //   view->append (M("PREFERENCES_D65"));
@@ -863,14 +863,14 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
 //   view->append (M("PREFERENCES_FLUOF7"));
 //   view->append (M("PREFERENCES_FLUOF11"));
 
-    Gtk::Label* greylab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREY") + ":", Gtk::ALIGN_START));
-    setExpandAlignProperties (greylab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
-    grey = Gtk::manage (new Gtk::ComboBoxText ());
-    setExpandAlignProperties (grey, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
+//    Gtk::Label* greylab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREY") + ":", Gtk::ALIGN_START));
+//    setExpandAlignProperties (greylab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
+//    grey = Gtk::manage (new Gtk::ComboBoxText ());
+//    setExpandAlignProperties (grey, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
 //   grey->append (M("PREFERENCES_GREY05"));
 //   grey->append (M("PREFERENCES_GREY10"));
 //   grey->append (M("PREFERENCES_GREY15"));
-    grey->append (M ("PREFERENCES_GREY18"));
+//    grey->append (M ("PREFERENCES_GREY18"));
 //   grey->append (M("PREFERENCES_GREY18_MENU"));
 
 //   grey->append (M("PREFERENCES_GREY23"));
@@ -892,10 +892,10 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
     Gtk::Label* lreloadneeded1 = Gtk::manage (new Gtk::Label (M ("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
     setExpandAlignProperties (lreloadneeded1, true, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
     colo->attach (*lreloadneeded1, 0, 0, 2, 1);
-    colo->attach (*viewlab, 0, 1, 1, 1);
-    colo->attach (*view, 1, 1, 1, 1);
-    colo->attach (*greylab, 0, 2, 1, 1);
-    colo->attach (*grey, 1, 2, 1, 1);
+//    colo->attach (*viewlab, 0, 1, 1, 1);
+//    colo->attach (*view, 1, 1, 1, 1);
+//    colo->attach (*greylab, 0, 2, 1, 1);
+//    colo->attach (*grey, 1, 2, 1, 1);
     colo->attach (*greySclab, 0, 3, 1, 1);
     colo->attach (*greySc, 1, 3, 1, 1);
     cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CIEART_LABEL")));
@@ -1710,8 +1710,8 @@ void Preferences::storePreferences ()
 #endif
 
     moptions.rtSettings.iccDirectory        = iccDir->get_filename ();
-    moptions.rtSettings.viewingdevice       = view->get_active_row_number ();
-    moptions.rtSettings.viewingdevicegrey   = grey->get_active_row_number ();
+ //   moptions.rtSettings.viewingdevice       = view->get_active_row_number ();
+ //   moptions.rtSettings.viewingdevicegrey   = grey->get_active_row_number ();
     moptions.rtSettings.viewinggreySc   = greySc->get_active_row_number ();
     //  moptions.rtSettings.autocielab            = cbAutocielab->get_active ();
     moptions.rtSettings.ciecamfloat             = cbciecamfloat->get_active ();
@@ -1870,8 +1870,8 @@ void Preferences::fillPreferences ()
         iccDir->set_current_folder (moptions.rtSettings.iccDirectory);
     }
 
-    view->set_active (moptions.rtSettings.viewingdevice);
-    grey->set_active (moptions.rtSettings.viewingdevicegrey);
+ //   view->set_active (moptions.rtSettings.viewingdevice);
+ //   grey->set_active (moptions.rtSettings.viewingdevicegrey);
     greySc->set_active (moptions.rtSettings.viewinggreySc);
     dnv->set_active (moptions.rtSettings.leveldnv);
     dnti->set_active (moptions.rtSettings.leveldnti);