diff --git a/Source/hydro/advection_util.H b/Source/hydro/advection_util.H
index 1669869dc4..c870c0ef0a 100644
--- a/Source/hydro/advection_util.H
+++ b/Source/hydro/advection_util.H
@@ -159,11 +159,12 @@ void conservative_to_primitive(int i, int j, int k,
 
     if (fill_passives) {
         // Load passively advected quantities into q
-        for (int ipassive = 0; ipassive < npassive; ipassive++) {
-            int n  = upassmap(ipassive);
-            int iq = qpassmap(ipassive);
+        constexpr_for<0, npassive>([&] (auto ipassive)
+        {
+            constexpr int n  = upassmap(ipassive);
+            constexpr int iq = qpassmap(ipassive);
             q(iq) = uin(i,j,k,n) * rhoinv;
-        }
+        });
     }
 
     // get gamc, p, T, c, csml using q state
diff --git a/Source/reactions/Castro_react.cpp b/Source/reactions/Castro_react.cpp
index d7bfac60d4..e61cff4c86 100644
--- a/Source/reactions/Castro_react.cpp
+++ b/Source/reactions/Castro_react.cpp
@@ -654,6 +654,7 @@ Castro::react_state(Real time, Real dt)
             }
 #endif
 
+#if 0
             // Convert the current state to primitive data.
             // This state is U* = U_old + dt A where A = -div U + S_hydro.
 
@@ -665,6 +666,7 @@ Castro::react_state(Real time, Real dt)
                                              Bx, By, Bz,
 #endif
                                              q_noreact, qaux_dummy, q_noreact.len() == NQ);
+#endif
 
             // dual energy formalism: in doing EOS calls in the burn,
             // switch between e and (E - K) depending on (E - K) / E.
@@ -751,6 +753,7 @@ Castro::react_state(Real time, Real dt)
 
             }
 
+#if 0
             // Convert the updated state (with the contribution from burning) to primitive data.
 
             Array1D<Real, 0, NQ-1> q_new;
@@ -779,6 +782,7 @@ Castro::react_state(Real time, Real dt)
                     I(i,j,k,n) = 0.0_rt;
                 }
             }
+#endif
 
             return {burn_failed};
         });