diff --git a/opencl/api/opencl/amdocl/cl_device.cpp b/opencl/api/opencl/amdocl/cl_device.cpp
index 3882a98df2..035b59709b 100644
--- a/opencl/api/opencl/amdocl/cl_device.cpp
+++ b/opencl/api/opencl/amdocl/cl_device.cpp
@@ -248,9 +248,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo,
       CASE(CL_DEVICE_VENDOR_ID, vendorId_);
       CASE(CL_DEVICE_MAX_COMPUTE_UNITS, maxComputeUnits_);
       CASE(CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS, maxWorkItemDimensions_);
-      CASE(CL_DEVICE_MAX_WORK_GROUP_SIZE, preferredWorkGroupSize_);
-      CASE(CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, preferredWorkGroupSize_);
-      CASE(CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, maxWorkGroupSize_);
+      CASE(CL_DEVICE_MAX_WORK_GROUP_SIZE, maxWorkGroupSize_);
       CASE(CL_DEVICE_MAX_WORK_ITEM_SIZES, maxWorkItemSizes_);
       CASE(CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR, preferredVectorWidthChar_);
       CASE(CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT, preferredVectorWidthShort_);
diff --git a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp
index bd64d4b3bd..18175abc2a 100644
--- a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp
+++ b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
 #ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
 #endif
-#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
-#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
 
 #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
diff --git a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h
index d1940d40de..8106804802 100644
--- a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h
@@ -207,8 +207,6 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
 #define CL_DEVICE_GFXIP_MAJOR_AMD                   0x404A
 #define CL_DEVICE_GFXIP_MINOR_AMD                   0x404B
 #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD        0x404C
-#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD     0x4030
-#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD           0x4031
 
 typedef union
 {
diff --git a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp
index bd64d4b3bd..18175abc2a 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp
+++ b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
 #ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
 #endif
-#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
-#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
 
 #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
diff --git a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h
index 09d722c44c..892382ee6d 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h
@@ -226,8 +226,6 @@ typedef CL_API_ENTRY cl_program
 #define CL_DEVICE_GFXIP_MAJOR_AMD                   0x404A
 #define CL_DEVICE_GFXIP_MINOR_AMD                   0x404B
 #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD        0x404C
-#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD     0x4030
-#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD           0x4031
 
 typedef union
 {
diff --git a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp
index bd64d4b3bd..18175abc2a 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp
+++ b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
 #ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
 #endif
-#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
-#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
 
 #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
diff --git a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h
index e9976ae44b..3fee2f7bc9 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h
@@ -207,8 +207,6 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
 #define CL_DEVICE_GFXIP_MAJOR_AMD                   0x404A
 #define CL_DEVICE_GFXIP_MINOR_AMD                   0x404B
 #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD        0x404C
-#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD     0x4030
-#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD           0x4031
 
 typedef union
 {
diff --git a/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp b/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp
index bd64d4b3bd..18175abc2a 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp
+++ b/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
 #ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
 #endif
-#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
-#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
-__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
-#endif
 
 #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
 __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
diff --git a/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h
index 5535f5b5d9..4f215913ca 100644
--- a/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h
+++ b/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h
@@ -207,8 +207,6 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
 #define CL_DEVICE_GFXIP_MAJOR_AMD                   0x404A
 #define CL_DEVICE_GFXIP_MINOR_AMD                   0x404B
 #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD        0x404C
-#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD     0x4030
-#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD           0x4031
 
 typedef union
 {