Fixed issue with auto-generated code and can now remove groups.