Remove references to groups