#JC-1458 remove groups