GPUState code cleanup

Sorry , i meant to put in patch-6