LPS-37719 remove groupId when we have className classPK