Drop old junk from OpenCL kernels.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Drop old junk from OpenCL kernels.