Rename group
Remove unused files