diff --git a/doc/manual/source/running-dynare.rst b/doc/manual/source/running-dynare.rst
index 983e2aa07606f8d8d6cef6896ea57585da2bf469..c1a285055890fcb6ca9b8dfce18b9236d71ea019 100644
--- a/doc/manual/source/running-dynare.rst
+++ b/doc/manual/source/running-dynare.rst
@@ -125,23 +125,20 @@ by the ``dynare`` command.
 
     .. option:: noclearall
 
-        By default, ``dynare`` will issue a ``clear all`` command to
-        MATLAB (<R2015b) or Octave, thereby deleting all workspace
-        variables and functions; this option instructs ``dynare`` not
-        to clear the workspace. Note that starting with MATLAB 2015b
-        ``dynare`` only deletes the global variables and the functions
-        using persistent variables, in order to benefit from the JIT
-        (Just In Time) compilation. In this case the option instructs
-        ``dynare`` not to clear the globals and functions.
+        By default, ``dynare`` deletes all the global variables and the
+        functions using persistent variables, in order to benefit from the JIT
+        (just-in-time) compilation. This option instructs ``dynare`` not to
+        clear those.
 
     .. option:: onlyclearglobals
 
-        By default, ``dynare`` will issue a ``clear all`` command to
-        MATLAB versions before 2015b and to Octave, thereby deleting
-        all workspace variables; this option instructs ``dynare`` to
-        clear only the global variables (i.e. ``M_, options_, oo_,
-        estim_params_, bayestopt_``, and ``dataset_``), leaving the
-        other variables in the workspace.
+        By default, ``dynare`` deletes all the global variables and the
+        functions using persistent variables, in order to benefit from the JIT
+        (just-in-time) compilation. This option instructs ``dynare`` to clear
+        only its own global variables (*i.e.* ``M_, options_, oo_,
+        estim_params_, bayestopt_``, ``dataset_``, ``dataset_info`` and
+        ``estimation_info``), leaving the other variables in the workspace, and
+        not clearing functions using persistent variables.
 
     .. option:: debug
 
diff --git a/matlab/dynare.m b/matlab/dynare.m
index ff01c28521dd6bd8dd491d46e79e72d6905fdbb9..ef85aec916d9d6f0c2c595c6192fc76bb5f7caae 100644
--- a/matlab/dynare.m
+++ b/matlab/dynare.m
@@ -301,8 +301,6 @@ if ~ isempty(find(abs(fname) == 46))
     fname = fname(:,1:find(abs(fname) == 46)-1) ;
 end
 
-% We need to clear the driver (and only the driver, because the "clear all"
-% within the driver will clean the rest)
 clear(['+' fname '/driver'])
 
 try