Cleanup G2_unique updates
Merge various different WIP
More cleanup & tightening
Get rid of large commented out code