On-going clean up to make the pure opencl build work