Avoid global GROUPING-macros
Replace cuda-kernels with dnt-version