diff --git a/client/gpu_opencl.cpp b/client/gpu_opencl.cpp
index 113998d130..4219ca3d1f 100644
--- a/client/gpu_opencl.cpp
+++ b/client/gpu_opencl.cpp
@@ -907,16 +907,6 @@ cl_int COPROCS::get_opencl_info(
             return ciErrNum;
         }
 
-        ciErrNum = (*__clGetDeviceInfo)(prop.device_id, CL_DEVICE_WAVEFRONT_WIDTH_AMD, sizeof(prop.amd_wavefront_width), &prop.amd_wavefront_width, NULL);
-        if (ciErrNum != CL_SUCCESS) {
-            snprintf(buf, sizeof(buf),
-                "clGetDeviceInfo failed to get CL_DEVICE_WAVEFRONT_WIDTH_AMD for device %d",
-                (int)device_index
-            );
-            warnings.push_back(buf);
-            return ciErrNum;
-        }
-
     }
 
     return CL_SUCCESS;
diff --git a/lib/opencl_boinc.cpp b/lib/opencl_boinc.cpp
index df60b404b2..bf15e321ea 100644
--- a/lib/opencl_boinc.cpp
+++ b/lib/opencl_boinc.cpp
@@ -63,7 +63,6 @@ void OPENCL_DEVICE_PROP::write_xml(MIOFILE& f, const char* tag, bool temp_file)
         "      <amd_simd_per_compute_unit>%lu</amd_simd_per_compute_unit>\n"
         "      <amd_simd_width>%lu</amd_simd_width>\n"
         "      <amd_simd_instruction_width>%lu</amd_simd_instruction_width>\n"
-        "      <amd_wavefront_width>%lu</amd_wavefront_width>\n"
         "      <opencl_platform_version>%s</opencl_platform_version>\n"
         "      <opencl_device_version>%s</opencl_device_version>\n"
         "      <opencl_driver_version>%s</opencl_driver_version>\n",
@@ -85,7 +84,6 @@ void OPENCL_DEVICE_PROP::write_xml(MIOFILE& f, const char* tag, bool temp_file)
         (unsigned long)amd_simd_per_compute_unit,
         (unsigned long)amd_simd_width,
         (unsigned long)amd_simd_instruction_width,
-        (unsigned long)amd_wavefront_width,
         opencl_platform_version,
         opencl_device_version,
         opencl_driver_version
@@ -181,10 +179,6 @@ int OPENCL_DEVICE_PROP::parse(XML_PARSER& xp, const char* end_tag) {
             amd_simd_instruction_width = n;
             continue;
         }
-        if (xp.parse_int("amd_wavefront_width", n)) {
-            amd_wavefront_width = n;
-            continue;
-        }
         if (xp.parse_str("opencl_platform_version", 
             opencl_platform_version, 
             sizeof(opencl_platform_version)
diff --git a/lib/opencl_boinc.h b/lib/opencl_boinc.h
index 73430ecf2e..cb7adf9453 100644
--- a/lib/opencl_boinc.h
+++ b/lib/opencl_boinc.h
@@ -61,7 +61,6 @@ struct OPENCL_DEVICE_PROP {
     cl_uint amd_simd_per_compute_unit;
     cl_uint amd_simd_width;
     cl_uint amd_simd_instruction_width;
-    cl_uint amd_wavefront_width;
 
     char opencl_platform_version[64];   // Version of OpenCL supported
                                         // the device's platform