diff --git a/NPLib/Core/NPAnalysisFactory.cxx b/NPLib/Core/NPAnalysisFactory.cxx
index 4532266f404a69db0aa3d061fcef1fdc60fc6805..b98af2d938558dda914c3233043a696ec61ef148 100644
--- a/NPLib/Core/NPAnalysisFactory.cxx
+++ b/NPLib/Core/NPAnalysisFactory.cxx
@@ -11,9 +11,6 @@ AnalysisFactory::AnalysisFactory(){
 
 /////////////////////////////////////////////////////////////////////////////////
 AnalysisFactory::~AnalysisFactory(){
-  if(m_Instance!=0)
-    delete m_Instance;
-
   m_Instance = 0 ;
 }
 
diff --git a/NPLib/Core/NPDetectorFactory.cxx b/NPLib/Core/NPDetectorFactory.cxx
index 116b72a0705d85af28c09b4b747d71c61f084f4b..42cca6377c632b4b489aecbb29e1e57023b3ffa3 100644
--- a/NPLib/Core/NPDetectorFactory.cxx
+++ b/NPLib/Core/NPDetectorFactory.cxx
@@ -27,9 +27,6 @@ DetectorFactory::DetectorFactory(){
 
 /////////////////////////////////////////////////////////////////////////////////
 DetectorFactory::~DetectorFactory(){
-  if(m_Instance!=0)
-    delete m_Instance;
-
   m_Instance = 0 ;
 }
 
diff --git a/NPLib/Core/NPDetectorManager.cxx b/NPLib/Core/NPDetectorManager.cxx
index df9171164f245fcbc680abe0c3344d9ee18041f5..28c4c9b778f441b487fdc87c6bb91330da57f536 100644
--- a/NPLib/Core/NPDetectorManager.cxx
+++ b/NPLib/Core/NPDetectorManager.cxx
@@ -189,7 +189,9 @@ void NPL::DetectorManager::ReadConfigurationFile(string Path)   {
           ReadingStatusTarget = false;
 
       }
-    }///////////////////////////////////////////
+    }
+    
+    ///////////////////////////////////////////
     /////////// Search for Detectors ///////////
     ////////////////////////////////////////////
     else{
diff --git a/NPLib/Core/NPOptionManager.cxx b/NPLib/Core/NPOptionManager.cxx
index cfdd9b14c4ce927c7d3e8da76d75e096520e8f0c..6e76cf380b4f9f67129b9327daeb9bdcea19781c 100644
--- a/NPLib/Core/NPOptionManager.cxx
+++ b/NPLib/Core/NPOptionManager.cxx
@@ -151,8 +151,7 @@ NPOptionManager::NPOptionManager(int argc, char** argv){
   ReadTheInputArgument(argc,argv);
 }
 ////////////////////////////////////////////////////////////////////////////////
-NPOptionManager::NPOptionManager(string arg)
-{  
+NPOptionManager::NPOptionManager(string arg){  
   vector<char *> args;
   istringstream iss(arg);
 
@@ -167,9 +166,9 @@ NPOptionManager::NPOptionManager(string arg)
 
   ReadTheInputArgument(args.size()-1, &args[0]);
 
-  for(size_t i = 0; i < args.size(); i++)
+/*  for(size_t i = 0; i < args.size(); i++)
     delete[] args[i];
-
+*/
 }
 ////////////////////////////////////////////////////////////////////////////////
 void NPOptionManager::CheckArguments(){
diff --git a/NPLib/Core/NPVSpectra.cxx b/NPLib/Core/NPVSpectra.cxx
index 7819243a1589594426632b5d92939cb528f28413..2a255b77f3516b32288aee8ccde5de9e8cc2bb8b 100644
--- a/NPLib/Core/NPVSpectra.cxx
+++ b/NPLib/Core/NPVSpectra.cxx
@@ -134,10 +134,8 @@ void VSpectra::WriteSpectra(string filename){
    // Go back to root directory
    f->cd();
 
-   // close file and delete associate pointer only in case
-   // of filename.
-       if (filename != "VOID") {
+   // close file
+   if (filename != "VOID") {
       f->Close();
-      delete f;
    }
 }
diff --git a/NPLib/Utility/npanalysis.cxx b/NPLib/Utility/npanalysis.cxx
index f2954ec18e2c7c508b994461a459e35b26e4557a..f428b17aca052bb509d17de348f5fe734b8eb5c8 100644
--- a/NPLib/Utility/npanalysis.cxx
+++ b/NPLib/Utility/npanalysis.cxx
@@ -41,13 +41,13 @@ int main(int argc , char** argv){
   if (myOptionManager->IsDefault("DetectorConfiguration")) {
     string name = RootInput::getInstance(inputfilename)->DumpAsciiFile("DetectorConfiguration");
     myOptionManager->SetDetectorFile(name);
-    cout << "\033[1;33mWarning: No Detector file given, using Input tree one\033[0m"<<endl;;
+    cout << "\033[1;33mWarning: No Detector file given, using Input tree one (if any)\033[0m"<<endl;;
   }
 
   if (myOptionManager->IsDefault("EventGenerator")) {
     string name = RootInput::getInstance(inputfilename)->DumpAsciiFile("EventGenerator");
     myOptionManager->SetReactionFile(name);
-    cout << "\033[1;33mWarning: No Event file given, using Input tree one\033[0m"<<endl;;
+    cout << "\033[1;33mWarning: No Event file given, using Input tree one (if any)\033[0m"<<endl;;
   }
 
   // get input files from NPOptionManager