diff --git a/Exec/Make.Maestro b/Exec/Make.Maestro
index 8957772ba..6ac09b201 100644
--- a/Exec/Make.Maestro
+++ b/Exec/Make.Maestro
@@ -62,9 +62,6 @@ all: $(executable)
 # Maestro uses a coarse grained OMP approach
 DEFINES += -DCRSEGRNDOMP
 
-# Maestro needs to compute additional thermodynamic derivatives in the EOS
-DEFINES += -DEXTRA_THERMO
-
 USE_MG = FALSE
 
 ifeq ($(DIM), 1)
@@ -123,10 +120,6 @@ USE_CXX_REACTIONS := TRUE
 
 ifeq ($(USE_REACT), TRUE)
   DEFINES += -DREACTIONS
-  ifeq ($(USE_SDC), TRUE)
-    # we need the compositional derivatives for SDC
-    DEFINES += -DEXTRA_THERMO
-   endif
 endif
 
 # Maestro SDC uses the SDC_EVOLVE_ENTHALPY mode in StarKiller Microphysics
diff --git a/Exec/science/urca/analysis/GNUmakefile b/Exec/science/urca/analysis/GNUmakefile
index 7ab3a6d14..da75c9980 100644
--- a/Exec/science/urca/analysis/GNUmakefile
+++ b/Exec/science/urca/analysis/GNUmakefile
@@ -63,10 +63,6 @@ ifdef NEED_EOS_NETWORK
 
 endif
 
-# Add EXTRA_THERMO to FPP_DEFINES to calculate dpdA, etc.
-EXTRA_THERMO := t
-FPP_DEFINES += -DEXTRA_THERMO=$(EXTRA_THERMO)
-
 # we are not using the CUDA stuff
 FPP_DEFINES += -DAMREX_DEVICE=""
 
diff --git a/Exec/test_problems/imposed_external_heating/MaestroMakeS.cpp b/Exec/test_problems/imposed_external_heating/MaestroMakeS.cpp
index 754111fd3..df46e6838 100644
--- a/Exec/test_problems/imposed_external_heating/MaestroMakeS.cpp
+++ b/Exec/test_problems/imposed_external_heating/MaestroMakeS.cpp
@@ -126,7 +126,7 @@ void Maestro::Make_S_cc(
                 const Array4<const Real> normal_arr = normal[lev].array(mfi);
 
                 AMREX_PARALLEL_FOR_3D(tileBox, i, j, k, {
-                    eos_t eos_state;
+                    eos_extra_t eos_state;
 
                     eos_state.rho = scal_arr(i, j, k, Rho);
                     eos_state.T = scal_arr(i, j, k, Temp);
@@ -199,7 +199,7 @@ void Maestro::Make_S_cc(
                     base_geom.anelastic_cutoff_density_coord(lev);
 
                 AMREX_PARALLEL_FOR_3D(tileBox, i, j, k, {
-                    eos_t eos_state;
+                    eos_extra_t eos_state;
 
                     eos_state.rho = scal_arr(i, j, k, Rho);
                     eos_state.T = scal_arr(i, j, k, Temp);
diff --git a/Source/MaestroIntra.cpp b/Source/MaestroIntra.cpp
index d83a084b5..7d05ce4ac 100644
--- a/Source/MaestroIntra.cpp
+++ b/Source/MaestroIntra.cpp
@@ -28,7 +28,7 @@ void Maestro::MakeIntraCoeffs(const Vector<MultiFab>& scal1,
 
             ParallelFor(gtbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) {
                 // old state first
-                eos_t eos_state;
+                eos_extra_t eos_state;
 
                 eos_state.rho = scalold(i, j, k, Rho);
                 eos_state.T = scalold(i, j, k, Temp);
diff --git a/Source/MaestroMakeS.cpp b/Source/MaestroMakeS.cpp
index 27af4c36f..518b7efc5 100644
--- a/Source/MaestroMakeS.cpp
+++ b/Source/MaestroMakeS.cpp
@@ -126,7 +126,7 @@ void Maestro::Make_S_cc(
                 const Array4<const Real> normal_arr = normal[lev].array(mfi);
 
                 ParallelFor(tileBox, [=] AMREX_GPU_DEVICE(int i, int j, int k) {
-                    eos_t eos_state;
+                    eos_extra_t eos_state;
 
                     eos_state.rho = scal_arr(i, j, k, Rho);
                     eos_state.T = scal_arr(i, j, k, Temp);
@@ -199,7 +199,7 @@ void Maestro::Make_S_cc(
                     base_geom.anelastic_cutoff_density_coord(lev);
 
                 ParallelFor(tileBox, [=] AMREX_GPU_DEVICE(int i, int j, int k) {
-                    eos_t eos_state;
+                    eos_extra_t eos_state;
 
                     eos_state.rho = scal_arr(i, j, k, Rho);
                     eos_state.T = scal_arr(i, j, k, Temp);
diff --git a/Source/MaestroThermal.cpp b/Source/MaestroThermal.cpp
index a9390b1f5..af4cbcc5d 100644
--- a/Source/MaestroThermal.cpp
+++ b/Source/MaestroThermal.cpp
@@ -306,7 +306,7 @@ void Maestro::MakeThermalCoeffs(const Vector<MultiFab>& scal,
                         Xkcoeff_arr(i, j, k, comp) = 0.0;
                     }
                 } else {
-                    eos_t eos_state;
+                    eos_extra_t eos_state;
                     eos_state.rho = scal_arr(i, j, k, Rho);
                     eos_state.T = scal_arr(i, j, k, Temp);
                     for (auto comp = 0; comp < NumSpec; ++comp) {