clean up Gz
simplifications that break things suck