Almost done with OpenCL rewrite

Simplifying hash functions