diff --git a/.gitmodules b/.gitmodules
index f447bb6ea2d2..9d170cbe1c61 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,9 +16,6 @@
     path = modules/fluid_properties/contrib/saline
     url = https://code.ornl.gov/neams/saline.git
     update = none
-[submodule "framework/contrib/wasp"]
-    path = framework/contrib/wasp
-    url = https://code.ornl.gov/neams-workbench/wasp.git
 [submodule "modules/solid_mechanics/contrib/neml2"]
     path = modules/solid_mechanics/contrib/neml2
     url = https://github.com/reverendbedford/neml2.git
diff --git a/framework/contrib/wasp b/framework/contrib/wasp
deleted file mode 160000
index 42b77e3afaae..000000000000
--- a/framework/contrib/wasp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 42b77e3afaae89af4dbac976a80ad6a7d77270ce
diff --git a/framework/include/utils/MathFVUtils.h b/framework/include/utils/MathFVUtils.h
index 95234d19b54e..a8fb0be2614d 100644
--- a/framework/include/utils/MathFVUtils.h
+++ b/framework/include/utils/MathFVUtils.h
@@ -511,15 +511,16 @@ interpolate(const Limiter<Scalar> & limiter,
             const FaceInfo & fi,
             const bool fi_elem_is_upwind)
 {
-  auto pr = interpCoeffs(limiter,
-                         phi_upwind,
-                         phi_downwind,
-                         grad_phi_upwind,
-                         /*grad_phi_face*/ static_cast<const libMesh::VectorValue<Scalar>*>(nullptr),
-                         /* max_value */ Scalar(0.0),
-                         /* min_value */ Scalar(0.0),
-                         fi,
-                         fi_elem_is_upwind);
+  auto pr =
+      interpCoeffs(limiter,
+                   phi_upwind,
+                   phi_downwind,
+                   grad_phi_upwind,
+                   /*grad_phi_face*/ static_cast<const libMesh::VectorValue<Scalar> *>(nullptr),
+                   /* max_value */ Scalar(0.0),
+                   /* min_value */ Scalar(0.0),
+                   fi,
+                   fi_elem_is_upwind);
   return pr.first * phi_upwind + pr.second * phi_downwind;
 }
 
diff --git a/framework/src/fvbcs/FVFunctorDirichletBC.C b/framework/src/fvbcs/FVFunctorDirichletBC.C
index 52278b10b2e6..36c5cb0cabc6 100644
--- a/framework/src/fvbcs/FVFunctorDirichletBC.C
+++ b/framework/src/fvbcs/FVFunctorDirichletBC.C
@@ -58,11 +58,13 @@ FVFunctorDirichletBCTempl<is_ad>::boundaryValue(const FaceInfo & fi) const
   if (!_use_other_side)
     return _functor(sfa, determineState());
   else if (fi.elemPtr() == sfa.face_side)
-    return _functor({&fi, Moose::FV::LimiterType::CentralDifference, true, false, fi.neighborPtr(), nullptr},
-                    determineState());
+    return _functor(
+        {&fi, Moose::FV::LimiterType::CentralDifference, true, false, fi.neighborPtr(), nullptr},
+        determineState());
   else
-    return _functor({&fi, Moose::FV::LimiterType::CentralDifference, true, false, fi.elemPtr(), nullptr},
-                    determineState());
+    return _functor(
+        {&fi, Moose::FV::LimiterType::CentralDifference, true, false, fi.elemPtr(), nullptr},
+        determineState());
 }
 
 template class FVFunctorDirichletBCTempl<false>;
diff --git a/modules/navier_stokes/src/fvkernels/WCNSFV2PMomentumAdvectionSlip.C b/modules/navier_stokes/src/fvkernels/WCNSFV2PMomentumAdvectionSlip.C
index f69e3416f890..7dab106d0fe3 100644
--- a/modules/navier_stokes/src/fvkernels/WCNSFV2PMomentumAdvectionSlip.C
+++ b/modules/navier_stokes/src/fvkernels/WCNSFV2PMomentumAdvectionSlip.C
@@ -73,7 +73,8 @@ WCNSFV2PMomentumAdvectionSlip::computeResidualsAndAData(const FaceInfo & fi)
   if (on_boundary)
     face_arg = singleSidedFaceArg();
   else
-    face_arg = Moose::FaceArg{&fi, Moose::FV::LimiterType::CentralDifference, true, false, nullptr, nullptr};
+    face_arg = Moose::FaceArg{
+        &fi, Moose::FV::LimiterType::CentralDifference, true, false, nullptr, nullptr};
 
   ADRealVectorValue u_slip_vel_vec;
   if (_dim == 1)
@@ -118,8 +119,12 @@ WCNSFV2PMomentumAdvectionSlip::computeResidualsAndAData(const FaceInfo & fi)
   else // we are an internal fluid flow face
   {
     const bool elem_is_upwind = MetaPhysicL::raw_value(u_slip_vel_vec) * _normal > 0;
-    const Moose::FaceArg advected_face_arg{
-        &fi, limiterType(_advected_interp_method), elem_is_upwind, correct_skewness, nullptr, nullptr};
+    const Moose::FaceArg advected_face_arg{&fi,
+                                           limiterType(_advected_interp_method),
+                                           elem_is_upwind,
+                                           correct_skewness,
+                                           nullptr,
+                                           nullptr};
     if (const auto [is_jump, eps_elem_face, eps_neighbor_face] =
             NS::isPorosityJumpFace(epsilon(), fi, state);
         is_jump)
diff --git a/modules/navier_stokes/src/postprocessors/IntegralDirectedSurfaceForce.C b/modules/navier_stokes/src/postprocessors/IntegralDirectedSurfaceForce.C
index 296dcbcd187e..604f7ad61442 100644
--- a/modules/navier_stokes/src/postprocessors/IntegralDirectedSurfaceForce.C
+++ b/modules/navier_stokes/src/postprocessors/IntegralDirectedSurfaceForce.C
@@ -74,8 +74,8 @@ IntegralDirectedSurfaceForce::computeFaceInfoIntegral(const FaceInfo * fi)
   mooseAssert(fi, "We should have a face info in " + name());
 
   const auto state = determineState();
-  const auto face_arg =
-      Moose::FaceArg({fi, Moose::FV::LimiterType::CentralDifference, true, false, nullptr, nullptr});
+  const auto face_arg = Moose::FaceArg(
+      {fi, Moose::FV::LimiterType::CentralDifference, true, false, nullptr, nullptr});
   const auto elem_arg = Moose::ElemArg({fi->elemPtr(), false});
 
   RealTensorValue pressure_term;
diff --git a/modules/navier_stokes/src/userobjects/INSFVRhieChowInterpolator.C b/modules/navier_stokes/src/userobjects/INSFVRhieChowInterpolator.C
index 2686b45fb0df..c9f3212c5a96 100644
--- a/modules/navier_stokes/src/userobjects/INSFVRhieChowInterpolator.C
+++ b/modules/navier_stokes/src/userobjects/INSFVRhieChowInterpolator.C
@@ -551,8 +551,12 @@ INSFVRhieChowInterpolator::getVelocity(const Moose::FV::InterpMethod m,
   if (Moose::FV::onBoundary(*this, fi))
   {
     const Elem * const boundary_elem = hasBlocks(elem->subdomain_id()) ? elem : neighbor;
-    const Moose::FaceArg boundary_face{
-        &fi, Moose::FV::LimiterType::CentralDifference, true, correct_skewness, boundary_elem, nullptr};
+    const Moose::FaceArg boundary_face{&fi,
+                                       Moose::FV::LimiterType::CentralDifference,
+                                       true,
+                                       correct_skewness,
+                                       boundary_elem,
+                                       nullptr};
     auto velocity = vel(boundary_face, time);
     incorporate_mesh_velocity(boundary_face, velocity);
 
diff --git a/modules/navier_stokes/src/variables/BernoulliPressureVariable.C b/modules/navier_stokes/src/variables/BernoulliPressureVariable.C
index 9551f67292e5..c605dda566da 100644
--- a/modules/navier_stokes/src/variables/BernoulliPressureVariable.C
+++ b/modules/navier_stokes/src/variables/BernoulliPressureVariable.C
@@ -68,7 +68,8 @@ BernoulliPressureVariable::elemIsUpwind(const Elem & elem,
                                         const FaceInfo & fi,
                                         const Moose::StateArg & time) const
 {
-  const Moose::FaceArg face{&fi, Moose::FV::LimiterType::CentralDifference, true, false, nullptr, nullptr};
+  const Moose::FaceArg face{
+      &fi, Moose::FV::LimiterType::CentralDifference, true, false, nullptr, nullptr};
 
   const VectorValue<ADReal> vel_face{(*_u)(face, time), (*_v)(face, time), (*_w)(face, time)};
   const bool fi_elem_is_upwind = vel_face * fi.normal() > 0;