Remove unused g2 variants and a clean up lol