diff --git a/cmake/scripts/codegen/macro_parser_common.py b/cmake/scripts/codegen/macro_parser_common.py
index 9ea8c79862..40cd9f50c5 100644
--- a/cmake/scripts/codegen/macro_parser_common.py
+++ b/cmake/scripts/codegen/macro_parser_common.py
@@ -9,7 +9,6 @@ and ledger_entries.macro files using pcpp and pyparsing.
 import re
 import shutil
 from pathlib import Path
-
 import pyparsing as pp
 from pcpp import Preprocessor
 
diff --git a/include/xrpl/ledger/helpers/VaultHelpers.h b/include/xrpl/ledger/helpers/VaultHelpers.h
index c3ceba02cd..bb2a98ba1d 100644
--- a/include/xrpl/ledger/helpers/VaultHelpers.h
+++ b/include/xrpl/ledger/helpers/VaultHelpers.h
@@ -108,8 +108,6 @@ isSoleShareholder(ReadView const& view, AccountID const& account, SLE::const_ref
     @return True if the vault is insolvent, false otherwise.
 */
 [[nodiscard]] bool
-isVaultInsolvent(
-    std::shared_ptr<SLE const> const& vault,
-    std::shared_ptr<SLE const> const& shareIssuance);
+isVaultInsolvent(SLE::const_ref vault, SLE::const_ref shareIssuance);
 
 }  // namespace xrpl
diff --git a/include/xrpl/tx/transactors/vault/VaultClawback.h b/include/xrpl/tx/transactors/vault/VaultClawback.h
index e2a0460a14..b8032809ee 100644
--- a/include/xrpl/tx/transactors/vault/VaultClawback.h
+++ b/include/xrpl/tx/transactors/vault/VaultClawback.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <xrpl/ledger/helpers/VaultHelpers.h>
 #include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
diff --git a/include/xrpl/tx/transactors/vault/VaultDeposit.h b/include/xrpl/tx/transactors/vault/VaultDeposit.h
index 2b88a60893..523b3f2e53 100644
--- a/include/xrpl/tx/transactors/vault/VaultDeposit.h
+++ b/include/xrpl/tx/transactors/vault/VaultDeposit.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <xrpl/ledger/helpers/VaultHelpers.h>
 #include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
diff --git a/include/xrpl/tx/transactors/vault/VaultWithdraw.h b/include/xrpl/tx/transactors/vault/VaultWithdraw.h
index 6e2c002838..7bbe06187d 100644
--- a/include/xrpl/tx/transactors/vault/VaultWithdraw.h
+++ b/include/xrpl/tx/transactors/vault/VaultWithdraw.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <xrpl/ledger/helpers/VaultHelpers.h>
 #include <xrpl/tx/Transactor.h>
 
 namespace xrpl {
diff --git a/src/libxrpl/ledger/helpers/VaultHelpers.cpp b/src/libxrpl/ledger/helpers/VaultHelpers.cpp
index 3d1d71bd99..699b2dd99d 100644
--- a/src/libxrpl/ledger/helpers/VaultHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/VaultHelpers.cpp
@@ -12,7 +12,6 @@
 #include <xrpl/protocol/STNumber.h>  // IWYU pragma: keep
 
 #include <cstdint>
-#include <memory>
 #include <optional>
 
 namespace xrpl {
@@ -139,9 +138,7 @@ isSoleShareholder(ReadView const& view, AccountID const& account, SLE::const_ref
 }
 
 [[nodiscard]] bool
-isVaultInsolvent(
-    std::shared_ptr<SLE const> const& vault,
-    std::shared_ptr<SLE const> const& shareIssuance)
+isVaultInsolvent(SLE::const_ref vault, SLE::const_ref shareIssuance)
 {
     XRPL_ASSERT(vault && vault->getType() == ltVAULT, "xrpl::isVaultInsolvent : Vault sle");
     XRPL_ASSERT(
diff --git a/src/test/jtx/vault.h b/src/test/jtx/vault.h
index 72e0639f23..5b25be553f 100644
--- a/src/test/jtx/vault.h
+++ b/src/test/jtx/vault.h
@@ -35,7 +35,7 @@ struct Vault
     {
         Account owner;
         uint256 id;
-        std::optional<std::uint32_t> flags;
+        std::optional<std::uint32_t> flags = std::nullopt;
     };
 
     static json::Value