g2: cleanup bullshit props and reorganize a bit

Change-Id: I680764dd00d09ddf0a4556cd48e5944351f4577a