Remove clutter.
Switch to AICP and new g2-common.