Adjust for new group and classifiers
Remove unnecessary semicolumns