diff --git a/Generator/src/GenAlgo.cpp b/Generator/src/GenAlgo.cpp
index 58f9d4e8b438085a5322e565f778506830e7ec14..07b6c32246ea2cc74d8043d877c9264e7e739112 100644
--- a/Generator/src/GenAlgo.cpp
+++ b/Generator/src/GenAlgo.cpp
@@ -13,14 +13,7 @@
 
 #include "IGenTool.h"
 #include "GenEvent.h"
-// #include "StdHepRdr.h"
-// #include "HepevtRdr.h"// not correct still
-// #include "SLCIORdr.h"
-// #include "HepMCRdr.h"
-// #include "GenPrinter.h"
-// #include "GenWriter.h"
 
-using namespace std;
 
 DECLARE_COMPONENT(GenAlgo)
 
@@ -42,25 +35,6 @@ GenAlgo::initialize() {
         m_genTools.push_back(gtname);
     }
     
-    // cout << "initialize start" << endl; 
-    // string generatorName = m_input_file.value();
-    // string outputName    = m_output_file.value();
-    // string format        = m_input_format.value();
-    // IGenTool* gen_reader;
-    // if(format=="stdhep") gen_reader  = new StdHepRdr(generatorName);    
-    // else if(format=="slcio") gen_reader  = new SLCIORdr(generatorName);    
-    // else if(format=="hepmc") gen_reader  = new HepMCRdr(generatorName);    
-    // else{cout << "Error : unsupport format for generator input file" << endl; return StatusCode::FAILURE; }
-    // //IGenTool* gen_reader  = new HepevtRdr(generatorName);    
-    // m_genTools.push_back(gen_reader);
-    // if(m_print.value()) {
-    //     IGenTool* gen_printer = new GenPrinter(generatorName);    
-    //     m_genTools.push_back(gen_printer);
-    // }
-    //IGenTool* gen_writer  = new GenWriter (outputName);    
-    //m_genTools.push_back(gen_writer);
-
-    // cout << "initialize done" << endl; 
     return StatusCode::SUCCESS;
 
 }
@@ -74,16 +48,16 @@ GenAlgo::execute() {
     for(auto gentool: m_genTools) {
         if (gentool->mutate(m_event)) {} 
         else {
-            cout << "Have read all events, stop now." << endl; 
+            warning() << "Have read all events, stop now." << endmsg; 
             auto ep = serviceLocator()->as<IEventProcessor>();
             if ( !ep ) {
-            error() << "Cannot get IEventProcessor" << endmsg;
-            return StatusCode::FAILURE;
+                error() << "Cannot get IEventProcessor" << endmsg;
+                return StatusCode::FAILURE;
             }
             ep->stopRun();
             return StatusCode::SUCCESS;
             
-             }
+        }
     }
 
     return StatusCode::SUCCESS;
@@ -92,10 +66,5 @@ GenAlgo::execute() {
 
 StatusCode
 GenAlgo::finalize() {
-    // cout << "finalize" << endl; 
-    // for(auto gentool: m_genTools) {
-    //     if (gentool->finish()) {} 
-    //     else {cout << "finish Failed" << endl; return StatusCode::FAILURE; }
-    // }
     return StatusCode::SUCCESS;
 }
diff --git a/Generator/src/GenAlgo.h b/Generator/src/GenAlgo.h
index 2eb6ac616f0a54f9acca641d197016b0fadf6b1f..9723e896995c34736afda7964074974681d66026 100644
--- a/Generator/src/GenAlgo.h
+++ b/Generator/src/GenAlgo.h
@@ -12,12 +12,6 @@
 #include "GenEvent.h"
 
 class IGenTool;
-namespace plcio {
-    class MCParticleCollection;
-}
-
-
-using namespace std;
 
 class GenAlgo: public GaudiAlgorithm {