Merge "Remove old RPC to remove groups from a group"