diff --git a/xml/cl.xml b/xml/cl.xml
index e0784300..f42cc2c6 100644
--- a/xml/cl.xml
+++ b/xml/cl.xml
@@ -6093,7 +6093,7 @@ server's OpenCL/api-docs repository.
                 <command name="clSetKernelExecInfoARM"/>
             </require>
         </extension>
-        <extension name="cl_arm_get_core_id" revision="0.0.0" condition="defined(CL_VERSION_1_2)" supported="opencl">
+        <extension name="cl_arm_get_core_id" revision="0.0.0" depends="CL_VERSION_1_2" supported="opencl">
             <require>
                 <type name="CL/cl.h"/>
             </require>
@@ -7286,7 +7286,7 @@ server's OpenCL/api-docs repository.
                 <command name="clEnqueueWriteHostPipeINTEL"/>
             </require>
         </extension>
-        <extension name="cl_ext_image_requirements_info" revision="0.5.0" depends="CL_VERSION_3_0" condition="defined(CL_VERSION_3_0)" supported="opencl">
+        <extension name="cl_ext_image_requirements_info" revision="0.5.0" depends="CL_VERSION_3_0" supported="opencl">
             <require comment="Types">
                 <type name="cl_image_requirements_info_ext"/>
             </require>
@@ -7377,7 +7377,7 @@ server's OpenCL/api-docs repository.
                 <command name="clGetMutableCommandInfoKHR"/>
             </require>
         </extension>
-        <extension name="cl_ext_image_from_buffer" revision="1.0.0" depends="CL_VERSION_3_0+cl_ext_image_requirements_info" condition="defined(CL_VERSION_3_0)" supported="opencl">
+        <extension name="cl_ext_image_from_buffer" revision="1.0.0" depends="CL_VERSION_3_0+cl_ext_image_requirements_info" supported="opencl">
             <require comment="cl_image_requirements_info_ext">
                 <enum name="CL_IMAGE_REQUIREMENTS_SLICE_PITCH_ALIGNMENT_EXT"/>
             </require>
diff --git a/xml/registry.rnc b/xml/registry.rnc
index ff85c0d1..6733b0f0 100644
--- a/xml/registry.rnc
+++ b/xml/registry.rnc
@@ -453,7 +453,6 @@ Extensions = element extensions {
 #   author - name of the author (usually a company or project name)
 #   contact - contact responsible for the tag (name and contact information)
 #   type - 'device' or 'instance', if present
-#   condition - C preprocessor expression (**TBD**)
 #   depends - boolean expression of API and/or extension names
 #       upon which this extension depends.
 #   supported - comma-separated list of API name(s) supporting this extension,
@@ -487,7 +486,6 @@ Extension = element extension {
     attribute author { text } ? ,
     attribute contact { text } ? ,
     attribute type { text } ? ,
-    attribute condition { text } ? ,
     attribute depends { text } ?,
     attribute supported { StringGroup } ? ,
     attribute ratified { text } ? ,