Continue cleanup of Grp.