diff --git a/src/scheme/LocalDtAcousticSolver.cpp b/src/scheme/LocalDtAcousticSolver.cpp
index b653baa4830736e4ed11a8ed8e4cf48a51f6089d..0aef1ae3477e7daac370764b299333e7ed39427d 100644
--- a/src/scheme/LocalDtAcousticSolver.cpp
+++ b/src/scheme/LocalDtAcousticSolver.cpp
@@ -857,31 +857,6 @@ class LocalDtAcousticSolverHandler::LocalDtAcousticSolver final
     const double& gamma = 1.4;
     double sum_dt       = 0;
 
-    // do{
-
-    //   if(sum_dt+dt2 > dt1){
-    // 	dt2 = dt1 - sum_dt;
-    //   }
-
-    //   const DiscreteScalarFunction& rho_d = new_rho2->get<DiscreteScalarFunction>();
-    //   const DiscreteVectorFunction& u_d   = new_u2->get<DiscreteVectorFunction>();
-    //   const DiscreteScalarFunction& E_d   = new_E2->get<DiscreteScalarFunction>();
-    //   const DiscreteScalarFunction& eps   = E_d - 0.5 * dot(u_d,u_d);
-    //   const DiscreteScalarFunction& p_d   = (gamma-1) * rho_d * eps;
-    //   const DiscreteScalarFunction& c_d   = sqrt(gamma * p_d / rho_d);
-
-    //   const std::shared_ptr<const DiscreteFunctionVariant>& new_p2 = std::make_shared<const
-    //   DiscreteFunctionVariant>(p_d); const std::shared_ptr<const DiscreteFunctionVariant>& new_c2 =
-    //   std::make_shared<const DiscreteFunctionVariant>(c_d);
-
-    //   auto [ur2,Fjr2] =
-    //   compute_fluxes(solver_type,new_rho2,new_c2,new_u2,new_p2,bc_descriptor_list2,CR_ur,CR_Fjr,map2);
-
-    //   std::tie(new_m2,new_rho2,new_u2,new_E2) = apply_fluxes(dt2,new_rho2,new_u2,new_E2,ur2,Fjr2);
-
-    //   sum_dt += dt2;
-    // }while(sum_dt < dt1);
-
     for (size_t i = 0; i < q; i++) {
       if (i == q - 1) {
         dt2 = dt1 - sum_dt;
@@ -899,10 +874,10 @@ class LocalDtAcousticSolverHandler::LocalDtAcousticSolver final
       const std::shared_ptr<const DiscreteFunctionVariant>& new_c2 =
         std::make_shared<const DiscreteFunctionVariant>(c_d);
 
-      auto [ur2, Fjr2] =
+      auto [sub_ur2, sub_Fjr2] =
         compute_fluxes(solver_type, new_rho2, new_c2, new_u2, new_p2, bc_descriptor_list2, CR_ur, CR_Fjr, map2);
 
-      std::tie(new_m2, new_rho2, new_u2, new_E2) = apply_fluxes(dt2, new_rho2, new_u2, new_E2, ur2, Fjr2);
+      std::tie(new_m2, new_rho2, new_u2, new_E2) = apply_fluxes(dt2, new_rho2, new_u2, new_E2, sub_ur2, sub_Fjr2);
 
       sum_dt += dt2;
     }
@@ -969,15 +944,15 @@ class LocalDtAcousticSolverHandler::LocalDtAcousticSolver final
       new_p2 = std::make_shared<DiscreteFunctionVariant>(p_d);
       new_c2 = std::make_shared<DiscreteFunctionVariant>(c_d);
 
-      double dt2 = 0.4 * acoustic_dt(new_c2);
+      dt2 = 0.4 * acoustic_dt(new_c2);
       // std::cout << "dt2 = " << dt2 << std::endl;
       if (sum_dt + dt2 > dt1) {
         dt2 = dt1 - sum_dt;
       }
 
-      auto [ur2, Fjr2] =
+      auto [sub_ur2, sub_Fjr2] =
         compute_fluxes(solver_type, new_rho2, new_c2, new_u2, new_p2, bc_descriptor_list2, CR_ur, CR_Fjr, map2);
-      std::tie(new_m2, new_rho2, new_u2, new_E2) = apply_fluxes(dt2, new_rho2, new_u2, new_E2, ur2, Fjr2);
+      std::tie(new_m2, new_rho2, new_u2, new_E2) = apply_fluxes(dt2, new_rho2, new_u2, new_E2, sub_ur2, sub_Fjr2);
       sum_dt += dt2;
     }
     std::tie(new_m2, new_rho2, new_u2, new_E2) = mesh_correction(new_m1, new_m2, new_rho2, new_u2, new_E2, map1, map2);
@@ -1414,8 +1389,8 @@ class LocalDtAcousticSolverHandler::LocalDtAcousticSolver final
     std::shared_ptr new_m2                                  = getCommonMesh({new_rho2, new_c2, new_u2, new_p2});
     std::shared_ptr m1                                      = getCommonMesh({rho1, c1, u1, p1});
 
-    const MeshType& mesh1 = *m1->get<MeshType>();
-    const MeshType& mesh2 = *new_m2->get<MeshType>();
+    //const MeshType& mesh1 = *m1->get<MeshType>();
+    //const MeshType& mesh2 = *new_m2->get<MeshType>();
 
     // double dt2 = 0.4 * acoustic_dt(new_c2);
     // double dt2_k = dt1/2;
diff --git a/src/scheme/LocalDtHyperelasticSolver.cpp b/src/scheme/LocalDtHyperelasticSolver.cpp
index f66ea554d4a44032352f5b792844429d2f830a09..0bfe1e06c868ce28554d8cd4e9e2128dc5edaf4f 100644
--- a/src/scheme/LocalDtHyperelasticSolver.cpp
+++ b/src/scheme/LocalDtHyperelasticSolver.cpp
@@ -849,11 +849,11 @@ class LocalDtHyperelasticSolverHandler::LocalDtHyperelasticSolver final
       const std::shared_ptr<const DiscreteFunctionVariant>& new_aT2 =
         std::make_shared<const DiscreteFunctionVariant>(aT_d);
 
-      auto [ur2, Fjr2] = compute_fluxes(solver_type, new_rho2, new_aL2, new_aT2, new_u2, new_sigma2,
+      auto [sub_ur2, sub_Fjr2] = compute_fluxes(solver_type, new_rho2, new_aL2, new_aT2, new_u2, new_sigma2,
                                         bc_descriptor_list2, CR_ur, CR_Fjr, map2);
 
       std::tie(new_m2, new_rho2, new_u2, new_E2, new_CG2) =
-        apply_fluxes(dt2, new_rho2, new_u2, new_E2, new_CG2, ur2, Fjr2);
+        apply_fluxes(dt2, new_rho2, new_u2, new_E2, new_CG2, sub_ur2, sub_Fjr2);
 
       sum_dt += dt2;
     }