diff --git a/mslib/msui/editor.py b/mslib/msui/editor.py
index 81c887482..b083815ba 100644
--- a/mslib/msui/editor.py
+++ b/mslib/msui/editor.py
@@ -332,8 +332,7 @@ def update_view(self):
                     duplicate = True
                     color = QtCore.Qt.red
             elif key == 'filepicker_default':
-                # ToDo remove filepicker_default
-                if data[key] not in ['default', 'qt', 'fs']:
+                if data[key] not in ['default', 'qt']:
                     invalid = True
                     color = QtCore.Qt.red
 
diff --git a/mslib/msui/mpl_qtwidget.py b/mslib/msui/mpl_qtwidget.py
index aa7e89c7e..f7afb5194 100644
--- a/mslib/msui/mpl_qtwidget.py
+++ b/mslib/msui/mpl_qtwidget.py
@@ -41,7 +41,7 @@
 from matplotlib.lines import Line2D
 
 from mslib.utils.thermolib import convert_pressure_to_vertical_axis_measure
-from mslib.utils import thermolib, FatalUserError
+from mslib.utils import thermolib
 from mslib.utils.config import config_loader, save_settings_qsettings, load_settings_qsettings
 from mslib.utils.units import units
 from mslib.msui import mpl_pathinteractor as mpl_pi
@@ -843,25 +843,6 @@ def set_settings(self, settings, save=False):
         self.plotter.set_settings(settings, save)
 
 
-save_figure_original = NavigationToolbar2QT.save_figure
-
-
-def save_figure(self, *args):
-    """
-    saves the figure dependent to the filepicker_default
-    """
-    # ToDo remove picker_type
-    picker_type = config_loader(dataset="filepicker_default")
-    if picker_type in ["default", "qt"]:
-        save_figure_original(self, *args)
-    else:
-        raise FatalUserError(f"Unknown file picker type '{picker_type}'")
-
-
-# Patch matplotlib function
-NavigationToolbar2QT.save_figure = save_figure
-
-
 class _Mode(str, enum.Enum):
     """
     Override _Mode of backend_base to include our tools.
diff --git a/mslib/utils/qt.py b/mslib/utils/qt.py
index d6c151ed3..f82745752 100644
--- a/mslib/utils/qt.py
+++ b/mslib/utils/qt.py
@@ -66,7 +66,7 @@ def get_save_filename_qt(*args):
 def get_pickertype(pickertype=None):
     if pickertype is None:
         return config_loader(dataset="filepicker_default")
-    if pickertype not in ["qt", "default", "fs"]:
+    if pickertype not in ["qt", "default"]:
         raise FatalUserError(f"Unknown file picker type '{pickertype}'.")
     return pickertype