General Mills scraps controversial new legal terms