Fixed found issue with removing classgroups