diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java
index 4bb901f26..2f7985cbd 100644
--- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java
+++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java
@@ -427,18 +427,7 @@ public class DatasetMigrationService {
             propertyDefinitionFieldSetEntity.setItems(new ArrayList<>());
             propertyDefinitionEntity.getFieldSets().put(currentFieldSet.getId().trim(), propertyDefinitionFieldSetEntity);
         }
-
-        PropertyDefinitionFieldSetItemEntity propertyDefinitionFieldSetItemEntity;
-        if (this.conventionService.isListNullOrEmpty(propertyDefinitionFieldSetEntity.getItems())){
-            propertyDefinitionFieldSetItemEntity = new PropertyDefinitionFieldSetItemEntity();
-            propertyDefinitionFieldSetItemEntity.setFields(new HashMap<>());
-            propertyDefinitionFieldSetItemEntity.setOrdinal(SimpleFieldSetOrdinal);
-            propertyDefinitionFieldSetEntity.getItems().add(propertyDefinitionFieldSetItemEntity);
-        } else {
-            propertyDefinitionFieldSetItemEntity = propertyDefinitionFieldSetEntity.getItems().getFirst();
-        }
-
-        propertyDefinitionFieldSetItemEntity.setComment(comment);
+        propertyDefinitionFieldSetEntity.setComment(comment);
     }
     
     private FieldEntity buildField(Dataset item, org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField, Object propertyValue, Map<UUID, ReferenceTypeDefinitionEntity> referenceTypeDefinitionEntityMap, Map<ReferenceKey, ReferenceEntity> referenceMap, int ordinal, List<DescriptionReferenceEntity> createdDescriptionReferenceEntities, Map<TagKey, UUID> savedTagIdsByName, HashSet<UUID> existingTagIds){