g2: clean up props

Change-Id: I6a185d90a003e389f7fd582a6d21f64183d93ebf