remove groups and fixed counting