diff --git a/scripts/templates/valddi.cpp.mako b/scripts/templates/valddi.cpp.mako
index 29938b9fc0..8cc4a9dc0f 100644
--- a/scripts/templates/valddi.cpp.mako
+++ b/scripts/templates/valddi.cpp.mako
@@ -221,13 +221,11 @@ namespace ur_validation_layer
     }
 
     ${x}_result_t context_t::tearDown() {
-        ${x}_result_t result = ${X}_RESULT_SUCCESS;
-
         if (enableLeakChecking) {
             getContext()->refCountContext->logInvalidReferences();
-            getContext()->refCountContext->clear();
         }
-        return result;
+        
+        return ${X}_RESULT_SUCCESS;
     }
 
 } // namespace ur_validation_layer
diff --git a/source/loader/layers/sanitizer/asan_options.hpp b/source/loader/layers/sanitizer/asan_options.hpp
index c8ce695472..298639b73c 100644
--- a/source/loader/layers/sanitizer/asan_options.hpp
+++ b/source/loader/layers/sanitizer/asan_options.hpp
@@ -98,7 +98,7 @@ struct AsanOptions {
 
         auto KV = OptionsEnvMap->find("quarantine_size_mb");
         if (KV != OptionsEnvMap->end()) {
-            auto Value = KV->second.front();
+            const auto &Value = KV->second.front();
             try {
                 auto temp_long = std::stoul(Value);
                 if (temp_long > UINT32_MAX) {
@@ -129,7 +129,7 @@ struct AsanOptions {
 
         KV = OptionsEnvMap->find("max_redzone");
         if (KV != OptionsEnvMap->end()) {
-            auto Value = KV->second.front();
+            const auto &Value = KV->second.front();
             try {
                 MaxRZSize = std::stoul(Value);
                 if (MaxRZSize > 2048) {
diff --git a/source/loader/layers/validation/ur_leak_check.hpp b/source/loader/layers/validation/ur_leak_check.hpp
index 1b588bc4f1..7ce5415d96 100644
--- a/source/loader/layers/validation/ur_leak_check.hpp
+++ b/source/loader/layers/validation/ur_leak_check.hpp
@@ -109,7 +109,7 @@ struct RefCountContext {
         // No more active adapters, so any references still held are leaked
         if (adapterCount == 0) {
             logInvalidReferences();
-            clear();
+            counts.clear();
         }
     }
 
@@ -133,8 +133,6 @@ struct RefCountContext {
         updateRefCount(handle, REFCOUNT_CREATE_OR_INCREASE, isAdapterHandle);
     }
 
-    void clear() { counts.clear(); }
-
     template <typename T> bool isReferenceValid(T handle) {
         std::unique_lock<std::mutex> lock(mutex);
         auto it = counts.find(static_cast<void *>(handle));
diff --git a/source/loader/layers/validation/ur_valddi.cpp b/source/loader/layers/validation/ur_valddi.cpp
index 1185a92dba..e41623b15c 100644
--- a/source/loader/layers/validation/ur_valddi.cpp
+++ b/source/loader/layers/validation/ur_valddi.cpp
@@ -11182,13 +11182,11 @@ ur_result_t context_t::init(ur_dditable_t *dditable,
 }
 
 ur_result_t context_t::tearDown() {
-    ur_result_t result = UR_RESULT_SUCCESS;
-
     if (enableLeakChecking) {
         getContext()->refCountContext->logInvalidReferences();
-        getContext()->refCountContext->clear();
     }
-    return result;
+
+    return UR_RESULT_SUCCESS;
 }
 
 } // namespace ur_validation_layer