[PATCH 7/8] removing CCI refs when attached to Groups, in favor of Rules or srg_support