diff --git a/Gems/Atom/RHI/Code/Tests/RHITestFixture.h b/Gems/Atom/RHI/Code/Tests/RHITestFixture.h
index 7bdd232a8b..da91c9e5f7 100644
--- a/Gems/Atom/RHI/Code/Tests/RHITestFixture.h
+++ b/Gems/Atom/RHI/Code/Tests/RHITestFixture.h
@@ -14,7 +14,6 @@
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Memory/PoolAllocator.h>
-#include <AzCore/Driller/Driller.h>
 #include <AzCore/Memory/AllocationRecords.h>
 #include <AzCore/RTTI/ReflectionManager.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
index 5692809443..d640c2d543 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <Atom/RHI/Device.h>
-#include <AzCore/Debug/EventTraceDrillerBus.h>
 #include <RHI/CommandQueueContext.h>
 #include <RHI/Device.h>
 
@@ -57,16 +56,6 @@ namespace AZ
                 m_commandQueues[hardwareQueueIdx]->Init(device, commandQueueDesc);
             }
 
-            Debug::EventTraceDrillerSetupBus::Broadcast(
-                &Debug::EventTraceDrillerSetupBus::Events::SetThreadName,
-                EventTrace::GpuQueueIds[static_cast<size_t>(RHI::HardwareQueueClass::Graphics)],
-                EventTrace::GpuQueueNames[static_cast<size_t>(RHI::HardwareQueueClass::Graphics)]);
-
-            Debug::EventTraceDrillerSetupBus::Broadcast(
-                &Debug::EventTraceDrillerSetupBus::Events::SetThreadName,
-                EventTrace::GpuQueueIds[static_cast<size_t>(RHI::HardwareQueueClass::Compute)],
-                EventTrace::GpuQueueNames[static_cast<size_t>(RHI::HardwareQueueClass::Compute)]);
-
             CalibrateClocks();
         }