gpu_hack: Some cleanup