diff --git a/projects/rocprofiler/src/core/rocprofiler.cpp b/projects/rocprofiler/src/core/rocprofiler.cpp
index 729d3b0f22..a544ca5849 100644
--- a/projects/rocprofiler/src/core/rocprofiler.cpp
+++ b/projects/rocprofiler/src/core/rocprofiler.cpp
@@ -537,7 +537,8 @@ PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version, uint64_t fa
     rocprofiler::StandaloneIntercept();
   }
 
-  ONLOAD_TRACE_END();
+  ONLOAD_TRACE("end intercept_mode(" << std::hex << intercept_mode << ")" <<
+               " intercept_mode_mask(" << std::hex << intercept_mode_mask << ")" << std::dec);
   return true;
 }
 
diff --git a/projects/rocprofiler/test/tool/tool.cpp b/projects/rocprofiler/test/tool/tool.cpp
index 1bc69196b1..e8a055c3b8 100644
--- a/projects/rocprofiler/test/tool/tool.cpp
+++ b/projects/rocprofiler/test/tool/tool.cpp
@@ -1621,8 +1621,6 @@ void rocprofiler_unload(bool is_destr) {
     abort();
   }
 
-  if (is_destr) CTX_OUTSTANDING_WAIT = 0;
-
   // Unregister dispatch callback
   rocprofiler_remove_queue_callbacks();
 
@@ -1642,7 +1640,6 @@ void rocprofiler_unload(bool is_destr) {
   }
   fflush(stdout);
 
-#if 0
   // Cleanup
   if (callbacks_data != NULL) {
     delete[] callbacks_data->features;
@@ -1659,7 +1656,6 @@ void rocprofiler_unload(bool is_destr) {
   range_vec = NULL;
   delete context_array;
   context_array = NULL;
-#endif
 
   ONLOAD_TRACE_END();
 }