diff --git a/ComputingTasks.cc b/ComputingTasks.cc
index 26f8fff9..123c6ebb 100644
--- a/ComputingTasks.cc
+++ b/ComputingTasks.cc
@@ -68,17 +68,17 @@ CheckStatement::checkPass(ModFileStructure &mod_file_struct)
   mod_file_struct.check_present = true;
 }
 
-Model_InfoStatement::Model_InfoStatement(const OptionsList &options_list_arg) :
+ModelInfoStatement::ModelInfoStatement(const OptionsList &options_list_arg) :
   options_list(options_list_arg)
 {
 }
 
-void Model_InfoStatement::checkPass(ModFileStructure &mod_file_struct)
+void ModelInfoStatement::checkPass(ModFileStructure &mod_file_struct)
 {
   //mod_file_struct.model_info_present = true;
 }
 
-void Model_InfoStatement::writeOutput(ostream &output, const string &basename) const
+void ModelInfoStatement::writeOutput(ostream &output, const string &basename) const
 {
   options_list.writeOutput(output);
   output << "model_info();\n";
diff --git a/ModelTree.cc b/ModelTree.cc
index 87f526f6..21278e0f 100644
--- a/ModelTree.cc
+++ b/ModelTree.cc
@@ -1566,44 +1566,6 @@ ModelTree::writeModelEquationsCodeOrdered(const string file_name, const Model_Bl
     code_file.write(&FENDBLOCK, sizeof(FENDBLOCK));
     code_file.write(&FEND, sizeof(FEND));
     code_file.close();
-    /*int mx_blck=j;
-    for(j=0;j<mx_blck;j++)
-      {
-        if(ModelBlock->Block_List[j].Simulation_Type==SOLVE_BACKWARD_COMPLETE || ModelBlock->Block_List[j].Simulation_Type==SOLVE_FOREWARD_COMPLETE)
-          {
-            m=ModelBlock->Block_List[j].Max_Lag;
-            for(i=0;i<ModelBlock->Block_List[j].IM_lead_lag[m].size;i++)
-              {
-                int eqr=ModelBlock->Block_List[j].IM_lead_lag[m].Equ[i];
-                int v=ModelBlock->Block_List[j].Equation[eqr];
-                Uf[v].Ufl=Uf[v].Ufl_First;
-                while(Uf[v].Ufl)
-                  {
-                    Uf[v].Ufl_First=Uf[v].Ufl->pNext;
-                    free(Uf[v].Ufl);
-                    Uf[v].Ufl=Uf[v].Ufl_First;
-                  }
-              }
-          }
-        else if(ModelBlock->Block_List[j].Simulation_Type==SOLVE_TWO_BOUNDARIES_COMPLETE || ModelBlock->Block_List[j].Simulation_Type==SOLVE_TWO_BOUNDARIES_SIMPLE)
-          {
-            for(m=0;m<=ModelBlock->Block_List[j].Max_Lead+ModelBlock->Block_List[j].Max_Lag;m++)
-              {
-                for(i=0;i<ModelBlock->Block_List[j].IM_lead_lag[m].size;i++)
-                  {
-                    int eqr=ModelBlock->Block_List[j].IM_lead_lag[m].Equ[i];
-                    int v=ModelBlock->Block_List[j].Equation[eqr];
-                    Uf[v].Ufl=Uf[v].Ufl_First;
-                    while(Uf[v].Ufl)
-                      {
-                        Uf[v].Ufl_First=Uf[v].Ufl->pNext;
-                        free(Uf[v].Ufl);
-                        Uf[v].Ufl=Uf[v].Ufl_First;
-                      }
-                  }
-              }
-          }
-      }*/
   }
 
 
diff --git a/ParsingDriver.cc b/ParsingDriver.cc
index ac254e3e..285bbcf7 100644
--- a/ParsingDriver.cc
+++ b/ParsingDriver.cc
@@ -733,7 +733,7 @@ ParsingDriver::simul()
 void
 ParsingDriver::model_info()
 {
-  mod_file->addStatement(new Model_InfoStatement(options_list));
+  mod_file->addStatement(new ModelInfoStatement(options_list));
   options_list.clear();
 }
 
diff --git a/include/ComputingTasks.hh b/include/ComputingTasks.hh
index f497a45b..1d5a749b 100644
--- a/include/ComputingTasks.hh
+++ b/include/ComputingTasks.hh
@@ -76,12 +76,12 @@ public:
   virtual void writeOutput(ostream &output, const string &basename) const;
 };
 
-class Model_InfoStatement : public Statement
+class ModelInfoStatement : public Statement
 {
 private:
   const OptionsList options_list;
 public:
-  Model_InfoStatement(const OptionsList &options_list_arg);
+  ModelInfoStatement(const OptionsList &options_list_arg);
   virtual void checkPass(ModFileStructure &mod_file_struct);
   virtual void writeOutput(ostream &output, const string &basename) const;
 };