diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index 367c419..347f4c3 100644
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -441,7 +441,6 @@ int NETGENPlugin_NETGEN_3D::RemoteCompute(SMESH_Mesh&         aMesh,
   elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(time7-time5);
   std::cout << "Time for exec of add_in_mesh: " << elapsed.count() * 1e-9 << std::endl;
 
-  fs::remove_all(tmp_folder);
   aMesh.Unlock();
 
   return true;
diff --git a/src/NETGENPlugin/NETGENPlugin_Runner.cxx b/src/NETGENPlugin/NETGENPlugin_Runner.cxx
index e69dcd5..a9b2a00 100644
--- a/src/NETGENPlugin/NETGENPlugin_Runner.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Runner.cxx
@@ -194,7 +194,7 @@ int netgen3d(const std::string input_mesh_file,
   // Importing mesh
   SMESH_Gen gen;
 
-  SMESH_Mesh *myMesh = gen.CreateMesh(false);
+  std::unique_ptr<SMESH_Mesh> myMesh(gen.CreateMesh(false));
   //TODO: To define
   std::string mesh_name = "Maillage_1";
 
@@ -657,7 +657,8 @@ int netgen2d(const std::string input_mesh_file,
   // Importing mesh
   SMESH_Gen gen;
 
-  SMESH_Mesh *myMesh = gen.CreateMesh(false);
+  std::unique_ptr<SMESH_Mesh> myMesh(gen.CreateMesh(false));
+
   //TODO: To define
   std::string mesh_name = "Maillage_1";