Revert "GPU: Enable Simple gov & Fix Compile Issue"

This reverts commit 8ca7bbf5e10adc5ba2af86d4a35079c3b13a67c6.