diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index 38adfd6d2..148ab8bd9 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -28,10 +28,9 @@ function global_initialization()
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-  global oo_ M_ options_ ct_ endval_ rplottype_
+  global oo_ M_ options_ ct_
 
   ct_=0;
-  endval_=0;
 
   options_.rplottype = 0;
   options_.smpl = 0;
@@ -101,7 +100,6 @@ function global_initialization()
 
   % Prior draws
   options_.forecast = 0;
-  options_.replic = 1;
 
   % Model
   options_.linear = 0;
diff --git a/matlab/resid.m b/matlab/resid.m
index 660759412..f01fd5630 100644
--- a/matlab/resid.m
+++ b/matlab/resid.m
@@ -28,7 +28,7 @@ function resid(period)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-  global M_ options_ oo_ it_ endval_ z
+  global M_ options_ oo_ it_ z
   
   if M_.exo_nbr > 0
     oo_.exo_simul = ones(M_.maximum_lag+M_.maximum_lead+period,1)* ...
diff --git a/matlab/simul.m b/matlab/simul.m
index 67db669f8..e28038394 100644
--- a/matlab/simul.m
+++ b/matlab/simul.m
@@ -30,7 +30,7 @@ function simul(dr)
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 global M_ options_ oo_ 
-global ys0_ ct_ endval_ 
+global ys0_ ct_
 
 if size(M_.lead_lag_incidence,2)-nnz(M_.lead_lag_incidence(M_.maximum_endo_lag+1,:)) > 0
   mess = ['DYNARE: error in model specification : variable ' M_.endo_names(find(M_.lead_lag_incidence(M_.maximum_lag+1,:)==0),:)] ;
diff --git a/preprocessor/ModFile.cc b/preprocessor/ModFile.cc
index 4be66ee47..939526b09 100644
--- a/preprocessor/ModFile.cc
+++ b/preprocessor/ModFile.cc
@@ -153,8 +153,7 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all) const
   if (clear_all)
     mOutputFile << "clear all" << endl;
   mOutputFile << "tic;" << endl;
-  mOutputFile << "global M_ oo_" << endl;
-  mOutputFile << "global options_ endval_" << endl;
+  mOutputFile << "global M_ oo_ options_" << endl;
   mOutputFile << "global ys0_ ex0_ ct_" << endl;
   mOutputFile << "options_ = [];" << endl;
   mOutputFile << "M_.fname = '" << basename << "';" << endl;
diff --git a/preprocessor/NumericalInitialization.cc b/preprocessor/NumericalInitialization.cc
index 061f2a80f..cf5bf6005 100644
--- a/preprocessor/NumericalInitialization.cc
+++ b/preprocessor/NumericalInitialization.cc
@@ -83,8 +83,7 @@ InitValStatement::writeOutput(ostream &output, const string &basename) const
          << "% INITVAL instructions" << endl
          << "%" << endl;
   // Writing initval block to set initial values for variables
-  output << "options_.initval_file = 0;" << endl
-         << "endval_=0;" << endl;
+  output << "options_.initval_file = 0;" << endl;
 
   writeInitValues(output);
 
@@ -113,8 +112,7 @@ EndValStatement::writeOutput(ostream &output, const string &basename) const
          << "%" << endl;
   // Writing endval block to set terminal values for variables
   output << "ys0_= oo_.steady_state;" << endl
-         << "ex0_ = oo_.exo_steady_state;" << endl
-         << "endval_ = 1;" << endl;
+         << "ex0_ = oo_.exo_steady_state;" << endl;
 
   writeInitValues(output);
 }