diff --git a/Source/TimeIntegration/ERF_TI_no_substep_fun.H b/Source/TimeIntegration/ERF_TI_no_substep_fun.H
index 1e9419b6d..4185ad049 100644
--- a/Source/TimeIntegration/ERF_TI_no_substep_fun.H
+++ b/Source/TimeIntegration/ERF_TI_no_substep_fun.H
@@ -106,26 +106,26 @@
                     });
 
                 } else { // Fixed or no terrain
-#ifdef ERF_USE_EB 
+#ifdef ERF_USE_EB
                     const Array4<const Real>& dJ_old =     detJ_cc[level]->const_array(mfi);
 #endif
                     ParallelFor(bx, ncomp_fast[IntVars::cons],
                     [=] AMREX_GPU_DEVICE (int i, int j, int k, int nn) {
                         const int n = scomp_fast[IntVars::cons] + nn;
-#ifdef ERF_USE_EB 
+#ifdef ERF_USE_EB
                         if (dJ_old(i,j,k) > 0.0) {
 #endif
                             ssum[IntVars::cons](i,j,k,n) = sold[IntVars::cons](i,j,k,n) + slow_dt *
                                ( fslow[IntVars::cons](i,j,k,n) );
-#ifdef ERF_USE_EB 
+#ifdef ERF_USE_EB
                         }
 #endif
                     });
- 
+
                     // Commenting out the update is a total HACK while developing the EB capability
                     ParallelFor(tbx, tby, tbz,
                     [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept {
-#ifdef ERF_USE_EB 
+#ifdef ERF_USE_EB
                         ssum[IntVars::xmom](i,j,k) = sold[IntVars::xmom](i,j,k);
 #else
                         ssum[IntVars::xmom](i,j,k) = sold[IntVars::xmom](i,j,k)
@@ -133,7 +133,7 @@
 #endif
                     },
                     [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept {
-#ifdef ERF_USE_EB 
+#ifdef ERF_USE_EB
                         ssum[IntVars::ymom](i,j,k) = sold[IntVars::ymom](i,j,k);
 #else
                         ssum[IntVars::ymom](i,j,k) = sold[IntVars::ymom](i,j,k)
@@ -141,7 +141,7 @@
 #endif
                     },
                     [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept {
-#ifdef ERF_USE_EB 
+#ifdef ERF_USE_EB
                         ssum[IntVars::zmom](i,j,k) = sold[IntVars::zmom](i,j,k);
 #else
                         ssum[IntVars::zmom](i,j,k) = sold[IntVars::zmom](i,j,k)
diff --git a/Source/Utils/ERF_solve_with_EB_mlmg.cpp b/Source/Utils/ERF_solve_with_EB_mlmg.cpp
index 6e66eaea1..72b465443 100644
--- a/Source/Utils/ERF_solve_with_EB_mlmg.cpp
+++ b/Source/Utils/ERF_solve_with_EB_mlmg.cpp
@@ -56,7 +56,7 @@ void ERF::solve_with_EB_mlmg (int lev, Vector<MultiFab>& rhs, Vector<MultiFab>&
     mleb.setLevelBC(0, nullptr);
 
     //
-    // This sets A = 0, B = 1 so that 
+    // This sets A = 0, B = 1 so that
     // the operator A alpha - b del dot beta grad to b
     // becomes  - del dot beta grad
     //
diff --git a/Source/Utils/ERF_solve_with_gmres.cpp b/Source/Utils/ERF_solve_with_gmres.cpp
index b753b9fb6..fe5423408 100644
--- a/Source/Utils/ERF_solve_with_gmres.cpp
+++ b/Source/Utils/ERF_solve_with_gmres.cpp
@@ -2,7 +2,6 @@
 #include "ERF_Utils.H"
 
 #include <AMReX_MLMG.H>
-//#include <AMReX_MLTerrainPoisson.H>
 #include <AMReX_GMRES.H>
 #include <AMReX_GMRES_MLMG.H>
 
@@ -11,12 +10,12 @@ using namespace amrex;
 /**
  * Solve the Poisson equation using GMRES
  */
-void ERF::solve_with_gmres (int /*lev*/, Vector<MultiFab>& /*rhs*/, Vector<MultiFab>& /*phi*/, Vector<Array<MultiFab,AMREX_SPACEDIM>>& /*fluxes*/)
-//void ERF::solve_with_gmres (int lev, Vector<MultiFab>& rhs, Vector<MultiFab>& phi, Vector<Array<MultiFab,AMREX_SPACEDIM>>& fluxes)
+void ERF::solve_with_gmres (int /*lev*/, Vector<MultiFab>& /*rhs*/, Vector<MultiFab>& /*phi*/,
+                            Vector<Array<MultiFab,AMREX_SPACEDIM>>& /*fluxes*/)
 {
+#if 0
     BL_PROFILE("ERF::solve_with_gmres()");
 
-#if 0
     auto const dom_lo = lbound(geom[lev].Domain());
     auto const dom_hi = ubound(geom[lev].Domain());