diff --git a/src/quantization.cpp b/src/quantization.cpp
index 276012bbf73..4c96d233fec 100644
--- a/src/quantization.cpp
+++ b/src/quantization.cpp
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -168,10 +168,7 @@ void quantize_8bits(program& prog,
     }
 
     run_passes(prog,
-               {quantize_8bits_pass{precision, *quant_8bit_params},
-                simplify_qdq{},
-                optimize_module{},
-                dead_code_elimination{}},
+               {quantize_8bits_pass{precision, *quant_8bit_params}, dead_code_elimination{}},
                quant_tracer());
 }
 
@@ -208,23 +205,7 @@ void quantize_fp8(program& prog, const target& t, const std::vector<parameter_ma
             supported_ins_names.insert(ins->name());
         }
     }
-    auto gfx_has_fp8fnuz = [&]() {
-        if(t.name() == "gpu")
-        {
-            auto context_value = t.get_context().to_value();
-            auto device_name   = context_value["gfx_name"].to<std::string>();
-            return (starts_with(device_name, "gfx9") and device_name >= "gfx940");
-        }
-        return false;
-    };
-    if(gfx_has_fp8fnuz())
-    {
-        quantize_8bits(prog, t, shape::fp8e4m3fnuz_type, calibration, supported_ins_names);
-    }
-    else
-    {
-        quantize_8bits(prog, t, shape::fp8e4m3fn_type, calibration, supported_ins_names);
-    }
+    quantize_8bits(prog, t, shape::fp8e4m3fn_type, calibration, supported_ins_names);
 }
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
diff --git a/src/targets/gpu/include/migraphx/gpu/context.hpp b/src/targets/gpu/include/migraphx/gpu/context.hpp
index 960e6ed55a0..7a1a7d34be3 100644
--- a/src/targets/gpu/include/migraphx/gpu/context.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/context.hpp
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -311,7 +311,6 @@ struct context
         value result;
         result["events"]  = events.size();
         result["streams"] = current_device->nstreams();
-        result["gfx_name"] = get_current_device().get_gfx_name();
 
         return result;
     }
diff --git a/test/gpu/context_serialize.cpp b/test/gpu/context_serialize.cpp
index d0c6072180f..845f594a8f1 100644
--- a/test/gpu/context_serialize.cpp
+++ b/test/gpu/context_serialize.cpp
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,7 @@ TEST_CASE(gpu_context_serialize)
     migraphx::context ctx = migraphx::gpu::context{0, 3};
 
     auto v = ctx.to_value();
-    EXPECT(v.size() == 3);
+    EXPECT(v.size() == 2);
 
     EXPECT(v.contains("events"));
     EXPECT(v.at("events").without_key().to<std::size_t>() == 0);
@@ -41,9 +41,6 @@ TEST_CASE(gpu_context_serialize)
     EXPECT(v.contains("streams"));
     EXPECT(v.at("streams").without_key().to<std::size_t>() == 3);
 
-    EXPECT(v.contains("gfx_name"));
-    EXPECT(not v.at("gfx_name").without_key().to<std::string>().empty());
-
     migraphx::gpu::context g_ctx;
     g_ctx.from_value(v);