Fix issue with auto-generated group names
Removed unused function