Revert "GPU OC: clean up"

This reverts commit 60b3dca9fb7910cba1b4fd65f111e0b44fc77015.