ocl: cleanup workarounds
Merge pull request #2477 from alalek:ocl_cleanup_workarounds