Revert "OC-UV-GPU control"

This reverts commit 2324224d639450eb45d74409206a40686a03b4f4.