Revert "added G2 (3 variant) support"

This reverts commit d01674f1107ef74ae70ee596270a0b13a230e62c.