Remove CLGroups references