diff --git a/core/src/test/java/org/imec/ivlab/core/model/evsref/extractor/impl/DiaryNoteEVSRefExtractorTest.java b/core/src/test/java/org/imec/ivlab/core/model/evsref/extractor/impl/DiaryNoteEVSRefExtractorTest.java
index 1e2b420b..dda224cd 100644
--- a/core/src/test/java/org/imec/ivlab/core/model/evsref/extractor/impl/DiaryNoteEVSRefExtractorTest.java
+++ b/core/src/test/java/org/imec/ivlab/core/model/evsref/extractor/impl/DiaryNoteEVSRefExtractorTest.java
@@ -11,7 +11,6 @@
 import org.imec.ivlab.core.kmehr.model.util.TransactionUtil;
 import org.imec.ivlab.core.model.evsref.EVSREF;
 import org.imec.ivlab.core.model.upload.KmehrWithReference;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.util.Collections;
@@ -24,20 +23,14 @@
 import be.fgov.ehealth.standards.kmehr.schema.v1.TransactionType;
 //import lombok.extern.log4j.Log4j2;
 
-@Test
 //@Log4j2
 public class DiaryNoteEVSRefExtractorTest extends TestCase {
 
   private EVSREF evsref = new EVSREF("TESTREF");
-  private KmehrWithReference kmehr;
-
-  @BeforeMethod
-  private void init() {
-    this.kmehr = initKmehr();
-  }
 
   @Test
   public void addEvsRefToNewTextWithLayoutIfNoTextFieldExists() {
+    KmehrWithReference kmehr = initKmehr();
     new DiaryNoteEVSRefExtractor().putEvsReference(kmehr, evsref);
 
     List<TextWithLayoutType> textWithLayoutTypes = TransactionUtil.getTextWithLayout(kmehr.getIdentifiableTransaction());
@@ -48,6 +41,7 @@ public void addEvsRefToNewTextWithLayoutIfNoTextFieldExists() {
 
   @Test
   public void addEvsRefToExistingTextIfExists() {
+    KmehrWithReference kmehr = initKmehr();
     TextType textType = new TextType();
     textType.setValue("existing content");
     kmehr.getIdentifiableTransaction().getText().add(textType);
diff --git a/datagenerator/pom.xml b/datagenerator/pom.xml
index bcdb0829..f4c586fb 100644
--- a/datagenerator/pom.xml
+++ b/datagenerator/pom.xml
@@ -51,28 +51,10 @@
             <artifactId>pdfbox</artifactId>
         </dependency>
 
-    <dependency>
-        <groupId>org.imec.ivlab.ehealth.sam</groupId>
-        <artifactId>sam-model-3.3</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </dependency>
-
-
     </dependencies>
 
     <build>
 
-        <resources>
-
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>sam/*</exclude>
-                </excludes>
-            </resource>
-
-        </resources>
-
         <plugins>
 
             <plugin>
diff --git a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/Medication.java b/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/Medication.java
deleted file mode 100644
index f344d324..00000000
--- a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/Medication.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.imec.ivlab.datagenerator.sam;
-
-import java.io.Serializable;
-
-public class Medication implements Serializable, Comparable<Medication> {
-        private String name;
-        private String officialName;
-        private String abbreviatedName;
-        private String prescriptionName;
-        private String CNK;
-        private Quantity quantity;
-
-        public String getNotNullName() {
-            if (name != null) {
-                return name;
-            }
-            if (abbreviatedName != null) {
-                return abbreviatedName;
-            }
-            if (officialName != null) {
-                return officialName;
-            }
-            if (prescriptionName != null) {
-                return prescriptionName;
-            }
-            return null;
-        }
-
-    public Quantity getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(Quantity quantity) {
-        this.quantity = quantity;
-    }
-
-    @Override
-        public int compareTo(Medication anotherMedication) {
-            return anotherMedication.getName().compareTo(this.name);
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getOfficialName() {
-            return officialName;
-        }
-
-        public void setOfficialName(String officialName) {
-            this.officialName = officialName;
-        }
-
-        public String getAbbreviatedName() {
-            return abbreviatedName;
-        }
-
-        public void setAbbreviatedName(String abbreviatedName) {
-            this.abbreviatedName = abbreviatedName;
-        }
-
-        public String getPrescriptionName() {
-            return prescriptionName;
-        }
-
-        public void setPrescriptionName(String prescriptionName) {
-            this.prescriptionName = prescriptionName;
-        }
-
-        public String getCNK() {
-            return CNK;
-        }
-
-        public void setCNK(String CNK) {
-            this.CNK = CNK;
-        }
-    }
\ No newline at end of file
diff --git a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/MedicinExporter.java b/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/MedicinExporter.java
deleted file mode 100644
index 32240b38..00000000
--- a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/MedicinExporter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.imec.ivlab.datagenerator.sam;
-
-import be.smals.sam.common.view.DeliveryEnvironmentType;
-import be.smals.sam.common.view.DmppCodeTypeType;
-import be.smals.sam.export.view.AmpDataType;
-import be.smals.sam.export.view.AmpFullDataType;
-import be.smals.sam.export.view.AmppComponentDataType;
-import be.smals.sam.export.view.AmppComponentEquivalentDataType;
-import be.smals.sam.export.view.AmppComponentEquivalentFullDataType;
-import be.smals.sam.export.view.AmppComponentFullDataType;
-import be.smals.sam.export.view.AmppFullDataType;
-import be.smals.sam.export.view.DmppDataType;
-import be.smals.sam.export.view.DmppFullDataType;
-import be.smals.sam.export.view.ExportActualMedicinesType;
-import be.smals.sam.ref.view.PackagingTypeType;
-
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.imec.ivlab.core.util.CollectionsUtil;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class MedicinExporter {
-
-    private final static Logger LOG = LogManager.getLogger(MedicinExporter.class);
-
-    SamProvider samProvider = new OfflineSamProvider();
-
-    public static void main(String[] args) {
-
-        // TODO: before running the main, uncomment following line in pom.xml of this project: <exclude>samexport${file.separator}**</exclude>
-        // make sure to not commit the uncommented line since it will make the EVS install file grow by 12MB
-
-        MedicinExporter medicinExporter = new MedicinExporter();
-        List<Medication> medications = medicinExporter.getMedicationWithCNK();
-        LOG.info("Got " + CollectionsUtil.size(medications) +  " medications");
-        Collections.sort(medications, Collections.reverseOrder());
-        for (Medication medication : medications) {
-            String medicationString = StringEscapeUtils.escapeXml11(medication.getNotNullName());
-            if (medication.getQuantity() != null) {
-                medicationString = medicationString + " (" + medication.getQuantity().getValue().intValue() + " " + medication.getQuantity().getUnit() + ")";
-            }
-            LOG.info(medication.getCNK() + ";" + medicationString);
-        }
-
-    }
-
-
-
-    public List<Medication> getMedicationWithCNK() {
-
-        List<Medication> foundMedications = new ArrayList<>();
-
-        ExportActualMedicinesType actualMedicines = samProvider.getActualMedicines();
-
-
-        for (AmpFullDataType ampFullDataType : actualMedicines.getAmp()) {
-
-            Medication medication = new Medication();
-            List<AmpDataType> data = ampFullDataType.getData();
-            for (AmpDataType ampDataType : data) {
-                if (ampDataType.getTo() == null) {
-                    if (ampDataType.getOfficialName() != null) {
-                        medication.setOfficialName(ampDataType.getOfficialName());
-                    }
-                    if (ampDataType.getName() != null) {
-                        medication.setName(ampDataType.getName().getNl());
-                    }
-                    if (ampDataType.getAbbreviatedName() != null) {
-                        medication.setAbbreviatedName(ampDataType.getAbbreviatedName().getNl());
-                    }
-                    if (ampDataType.getPrescriptionName() != null) {
-                        medication.setPrescriptionName(ampDataType.getPrescriptionName().getNl());
-                    }
-                }
-            }
-
-            Medication medicationClone = SerializationUtils.clone(medication);
-
-            medicationClone = fillQuantity(ampFullDataType, medicationClone);
-            if (medicationClone != null) {
-                foundMedications.add(medicationClone);
-            }
-
-        }
-
-        return foundMedications;
-    }
-
-    private Medication fillQuantity(AmpFullDataType ampFullDataType, Medication medicationClone) {
-        for (AmppFullDataType amppFullDataType : ampFullDataType.getAmpp()) {
-            for (DmppFullDataType dmppFullDataType : amppFullDataType.getDmpp()) {
-                if (dmppFullDataType.getDeliveryEnvironment().equals(DeliveryEnvironmentType.P) && dmppFullDataType.getCodeType().equals(DmppCodeTypeType.CNK)) {
-
-                    for (DmppDataType dmppDataType : dmppFullDataType.getData()) {
-//                            LOG.info("Medication with CNK: " + dmppFullDataType.getCode() + " has from date: " + dmppDataType.getFrom() + " and to date: " + dmppDataType.getTo());
-                        if (dmppDataType.getTo() == null) {
-                            Quantity quantity = getQuantity(amppFullDataType);
-                            if (quantity != null) {
-                                String unit = StringUtils.replaceIgnoreCase(quantity.getUnit(), "{unit}", "stuks");
-                                unit = RegExUtils.removeAll(unit, "[\\[\\]\\{\\}]");
-                                quantity.setUnit(unit);
-                                medicationClone.setQuantity(quantity);
-                            }
-                            medicationClone.setCNK(dmppFullDataType.getCode());
-                            return medicationClone;
-                        }
-                    }
-
-                }
-            }
-        }
-        return null;
-    }
-
-
-    private Quantity getQuantity(AmppFullDataType amppFullDataType) {
-        for (AmppComponentFullDataType ampComponentDataType : amppFullDataType.getAmppComponent()) {
-
-            Quantity quantity = null;
-
-            for (AmppComponentDataType amppComponentDataType : ampComponentDataType.getData()) {
-                if (amppComponentDataType.getContentMultiplier() != null) {
-
-                    PackagingTypeType packagingType = amppComponentDataType.getPackagingType();
-                    if (packagingType != null && packagingType.getName() != null) {
-                        quantity = new Quantity();
-                        quantity.setValue(BigDecimal.valueOf(amppComponentDataType.getContentMultiplier()));
-                        quantity.setUnit(packagingType.getName().getNl());
-                        return quantity;
-                    }
-
-                }
-            }
-
-
-            for (AmppComponentEquivalentFullDataType amppComponentEquivalentFullDataType : ampComponentDataType.getAmppComponentEquivalent()) {
-                for (AmppComponentEquivalentDataType amppComponentEquivalentDataType : amppComponentEquivalentFullDataType.getData()) {
-                    if (amppComponentEquivalentDataType.getContent() != null) {
-                        quantity = new Quantity();
-                        if (quantity.getValue() == null) {
-                            quantity.setValue(amppComponentEquivalentDataType.getContent().getValue());
-                        }
-
-                        quantity.setUnit(amppComponentEquivalentDataType.getContent().getUnit());
-                        return quantity;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/OfflineSamProvider.java b/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/OfflineSamProvider.java
deleted file mode 100644
index 87e020fb..00000000
--- a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/OfflineSamProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.imec.ivlab.datagenerator.sam;
-
-import be.smals.sam.export.view.ExportActualMedicinesType;
-import org.imec.ivlab.core.exceptions.TransformationException;
-import org.imec.ivlab.core.util.IOUtils;
-import org.imec.ivlab.core.util.JAXBUtils;
-
-public class OfflineSamProvider implements SamProvider {
-
-    @Override
-    public ExportActualMedicinesType getActualMedicines() {
-        String resourceAsString = IOUtils.getResourceAsString("/sam/AMP-1530615628300.xml");
-        try {
-            return JAXBUtils.unmarshal(ExportActualMedicinesType.class, resourceAsString);
-        } catch (TransformationException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/Quantity.java b/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/Quantity.java
deleted file mode 100644
index 20430072..00000000
--- a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/Quantity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.imec.ivlab.datagenerator.sam;
-
-import java.math.BigDecimal;
-
-public class Quantity {
-
-    private BigDecimal value;
-    private String unit;
-
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    public void setValue(BigDecimal value) {
-        this.value = value;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-}
diff --git a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/SamProvider.java b/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/SamProvider.java
deleted file mode 100644
index 4d9eb794..00000000
--- a/datagenerator/src/main/java/org/imec/ivlab/datagenerator/sam/SamProvider.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.imec.ivlab.datagenerator.sam;
-
-import be.smals.sam.export.view.ExportActualMedicinesType;
-
-public interface SamProvider {
-
-    public ExportActualMedicinesType getActualMedicines();
-
-}
diff --git a/distribution/pom.xml b/distribution/pom.xml
index b8cf7953..679e25fe 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -71,10 +71,11 @@
 
         <plugins>
 
-            <!-- copy izpack resources into izpack staging area, expected by izpack.xml -->
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
                 <executions>
+                    <!-- copy izpack resources into izpack staging area, expected by izpack.xml -->
                     <execution>
                         <id>copy-resources</id>
                         <phase>install</phase>
@@ -101,6 +102,24 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <!-- Copy example config files : actors/patients/... -->
+                    <execution>
+                        <id>copy-delivery-output</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${build.install.directory.installer}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources-filtered/delivery_output</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <includeEmptyDirs>true</includeEmptyDirs>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
 
@@ -176,37 +195,8 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.3.1</version>
-                <executions>
-                    <execution>
-                        <id>copy-delivery-output</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${build.install.directory.installer}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/src/main/resources-filtered/delivery_output</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                            <includeEmptyDirs>true</includeEmptyDirs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
 
-
     </build>
 
-
-
-
 </project>
\ No newline at end of file
diff --git a/ehconnector/pom.xml b/ehconnector/pom.xml
index 8891a273..3b22c4a1 100644
--- a/ehconnector/pom.xml
+++ b/ehconnector/pom.xml
@@ -93,7 +93,7 @@
         </dependency>
         <dependency>
             <groupId>be.fgov.ehealth.connector</groupId>
-            <artifactId>connector-business-dicsv4</artifactId>
+            <artifactId>connector-business-dicsv5</artifactId>
             <version>${ehealth.connector.version}</version>
         </dependency>
         <dependency>
@@ -273,7 +273,7 @@
         </dependency>
         <dependency>
             <groupId>be.fgov.ehealth.connector</groupId>
-            <artifactId>connector-utilities-dicsv4</artifactId>
+            <artifactId>connector-utilities-dicsv5</artifactId>
             <version>${ehealth.connector.version}</version>
         </dependency>
         <dependency>
@@ -402,25 +402,25 @@
             <version>2.0.7</version>
         </dependency>
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.12.5</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>2.0.7</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>2.0.7</version>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.12.5</version>
+        </dependency>
         <dependency>
             <groupId>fr.xebia.extras</groupId>
             <artifactId>selma</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.7</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
diff --git a/ehconnector/src/main/java/org/imec/ivlab/ehconnector/business/HubHelper.java b/ehconnector/src/main/java/org/imec/ivlab/ehconnector/business/HubHelper.java
index 275b8764..889379e2 100644
--- a/ehconnector/src/main/java/org/imec/ivlab/ehconnector/business/HubHelper.java
+++ b/ehconnector/src/main/java/org/imec/ivlab/ehconnector/business/HubHelper.java
@@ -263,10 +263,6 @@ public HeaderType createHeader(String standardDate) throws Exception {
         DateTime now = DateTime.now();
         header.setDate(now);
         header.setTime(now);
-        // Previously in EVS : 
-        // LocalDate now = LocalDate.now();
-        // header.setDate(DateUtils.toXmlGregorianCalendar(now));
-        // header.setTime(DateUtils.toXmlGregorianCalendar(now));
         header.getRecipients().add(createHubRecipient());
         header.setSender(createSender());
         return header;
@@ -440,20 +436,10 @@ public PersonType createPatient() {
         person.getFirstnames().add(testPatient.getFirstName());
         person.setFamilyname(testPatient.getLastName());
         person.setRecorddatetime(DateTime.now());
-        // Previously in EVS : 
-        //person.setRecorddatetime(DateUtils.getCalendar());
         person.setUsuallanguage("fr");
 
         DateType dateType = new DateType();
         dateType.setDate(new DateTime(1991, 12, 12, 0, 0));
-        // Previously in EVS 
-        /*
-        try {
-            LocalDate localDate = LocalDate.of(1991, 12, 12);
-            dateType.setDate(DateUtils.toXmlGregorianCalendar(localDate));
-        } catch (DatatypeConfigurationException e) {
-            e.printStackTrace();
-        }*/
         person.setBirthdate(dateType);
 
         Nationality nationality = new Nationality();
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/_maven.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/_maven.repositories
deleted file mode 100644
index a1c8fae5..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/_maven.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Tue Jun 20 12:49:21 CEST 2017
-kmehr-model-1.19-1.0-SNAPSHOT.pom>=
-kmehr-model-1.19-1.0-SNAPSHOT.jar>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/_remote.repositories
deleted file mode 100644
index c551a79c..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Jun 21 13:13:47 CEST 2017
-kmehr-model-1.19-1.0-SNAPSHOT.pom>=
-kmehr-model-1.19-1.0-SNAPSHOT.jar>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/kmehr-model-1.19-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/kmehr-model-1.19-1.0-SNAPSHOT.jar
deleted file mode 100644
index d917b761..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/kmehr-model-1.19-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/kmehr-model-1.19-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/kmehr-model-1.19-1.0-SNAPSHOT.pom
deleted file mode 100644
index b46784ce..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/kmehr-model-1.19-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.19</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>
-                        ${project.basedir}/src/main/resources/
-                    </bindingDirectory>
-                    <bindingIncludes>
-                        <include>**/*.xjb</include>
-                    </bindingIncludes>
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index 1b90f86d..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.19</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20170621111347</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20170621111347</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20170621111347</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 0f7fe22c..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Fri Aug 04 14:54:06 CEST 2017
-kmehr1.19-1.1-SNAPSHOT.jar>=
-kmehr1.19-1.1-SNAPSHOT.pom>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/kmehr1.19-1.1-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/kmehr1.19-1.1-SNAPSHOT.jar
deleted file mode 100644
index 7ce77241..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/kmehr1.19-1.1-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/kmehr1.19-1.1-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/kmehr1.19-1.1-SNAPSHOT.pom
deleted file mode 100644
index 2632d41d..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/kmehr1.19-1.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>be.fgov.ehealth.standards</groupId>
-  <artifactId>kmehr1.19</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <description>POM was created from install:install-file</description>
-</project>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index ddd822f4..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.1-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>be.fgov.ehealth.standards</groupId>
-  <artifactId>kmehr1.19</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20170804125406</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20170804125406</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20170804125406</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 5a40bda3..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Tue Jan 23 15:32:30 CET 2018
-kmehr-model-1.19-1.3-SNAPSHOT.pom>=
-kmehr-model-1.19-1.3-SNAPSHOT.jar>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/kmehr-model-1.19-1.3-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/kmehr-model-1.19-1.3-SNAPSHOT.jar
deleted file mode 100644
index 166e69b3..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/kmehr-model-1.19-1.3-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/kmehr-model-1.19-1.3-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/kmehr-model-1.19-1.3-SNAPSHOT.pom
deleted file mode 100644
index 43308592..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/kmehr-model-1.19-1.3-SNAPSHOT.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.19</artifactId>
-    <version>1.3-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>
-                        ${project.basedir}/src/main/resources/
-                    </bindingDirectory>
-                    <bindingIncludes>
-                        <include>**/*.xjb</include>
-                    </bindingIncludes>
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index f5198b75..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/1.3-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.19</artifactId>
-  <version>1.3-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20180123143230</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.3-SNAPSHOT</value>
-        <updated>20180123143230</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.3-SNAPSHOT</value>
-        <updated>20180123143230</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/maven-metadata-local.xml
deleted file mode 100644
index 42b8b648..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.19/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.19</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20170621111347</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/_maven.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/_maven.repositories
deleted file mode 100644
index 80b7b992..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/_maven.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Fri Apr 20 11:50:06 CEST 2018
-kmehr-model-1.22-1.0-SNAPSHOT.jar>=
-kmehr-model-1.22-1.0-SNAPSHOT.pom>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/kmehr-model-1.22-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/kmehr-model-1.22-1.0-SNAPSHOT.jar
deleted file mode 100644
index 7edd99a6..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/kmehr-model-1.22-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/kmehr-model-1.22-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/kmehr-model-1.22-1.0-SNAPSHOT.pom
deleted file mode 100644
index fe5042d2..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/kmehr-model-1.22-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.22</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>
-                        ${project.basedir}/src/main/resources/
-                    </bindingDirectory>
-                    <bindingIncludes>
-                        <include>**/*.xjb</include>
-                    </bindingIncludes>
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index b6cc4822..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.22</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20180420095006</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20180420095006</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20180420095006</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/maven-metadata-local.xml
deleted file mode 100644
index d7bb2560..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.22/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.22</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20180420095006</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/_remote.repositories
deleted file mode 100644
index b16a2a76..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Thu May 23 15:48:43 CEST 2019
-kmehr-model-1.28-1.0-SNAPSHOT.jar>=
-kmehr-model-1.28-1.0-SNAPSHOT.pom>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/kmehr-model-1.28-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/kmehr-model-1.28-1.0-SNAPSHOT.jar
deleted file mode 100644
index 455275b2..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/kmehr-model-1.28-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/kmehr-model-1.28-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/kmehr-model-1.28-1.0-SNAPSHOT.pom
deleted file mode 100644
index 75c7505c..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/kmehr-model-1.28-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.28</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>
-                        ${project.basedir}/src/main/resources/
-                    </bindingDirectory>
-                    <bindingIncludes>
-                        <include>**/*.xjb</include>
-                    </bindingIncludes>
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index d3d6e31a..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.28</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20190523134843</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20190523134843</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20190523134843</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/resolver-status.properties b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index dd92fa1c..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/1.0-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Thu May 23 15:31:18 CEST 2019
-maven-metadata-my-local-repo.xml.error=
-maven-metadata-my-local-repo.xml.lastUpdated=1558618278396
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/maven-metadata-local.xml
deleted file mode 100644
index 29478b49..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.28/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.28</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20190523134843</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/_remote.repositories
deleted file mode 100644
index 66e993fb..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Jun 21 13:01:25 CEST 2017
-kmehr-model-1.3-1.0-SNAPSHOT.pom>=
-kmehr-model-1.3-1.0-SNAPSHOT.jar>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/kmehr-model-1.3-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/kmehr-model-1.3-1.0-SNAPSHOT.jar
deleted file mode 100644
index 64a4c6d2..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/kmehr-model-1.3-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/kmehr-model-1.3-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/kmehr-model-1.3-1.0-SNAPSHOT.pom
deleted file mode 100644
index 2bcd31ce..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/kmehr-model-1.3-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.3</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <!--<bindingDirectory>-->
-                        <!--${project.basedir}/src/main/resources/-->
-                    <!--</bindingDirectory>-->
-                    <!--<bindingIncludes>-->
-                        <!--<include>**/*.xjb</include>-->
-                    <!--</bindingIncludes>-->
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index d1cb05e1..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.3</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20170621110125</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20170621110125</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20170621110125</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/resolver-status.properties b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 7bbe7dda..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.0-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Wed Jun 21 15:25:23 CEST 2017
-maven-metadata-my-local-repo.xml.error=
-maven-metadata-my-local-repo.xml.lastUpdated=1498051523348
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index dd31d09d..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Fri Aug 04 14:24:04 CEST 2017
-kmehr1.3-1.1-SNAPSHOT.jar>=
-kmehr1.3-1.1-SNAPSHOT.pom>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/kmehr1.3-1.1-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/kmehr1.3-1.1-SNAPSHOT.jar
deleted file mode 100644
index 1ebd38b8..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/kmehr1.3-1.1-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/kmehr1.3-1.1-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/kmehr1.3-1.1-SNAPSHOT.pom
deleted file mode 100644
index ee03a1e8..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/kmehr1.3-1.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>be.fgov.ehealth.standards</groupId>
-  <artifactId>kmehr1.3</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <description>POM was created from install:install-file</description>
-</project>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index fa48bc0c..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/1.1-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>be.fgov.ehealth.standards</groupId>
-  <artifactId>kmehr1.3</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20170804122404</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20170804122404</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20170804122404</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/maven-metadata-local.xml
deleted file mode 100644
index 8172a218..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.3/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.3</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20170621110125</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/_remote.repositories
deleted file mode 100644
index aea324aa..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
-#Thu May 27 14:33:31 CEST 2021
-kmehr-model-1.34-1.0-SNAPSHOT.pom>=
-kmehr-model-1.34-1.0-SNAPSHOT.jar>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/kmehr-model-1.34-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/kmehr-model-1.34-1.0-SNAPSHOT.jar
deleted file mode 100644
index ad3e2e80..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/kmehr-model-1.34-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/kmehr-model-1.34-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/kmehr-model-1.34-1.0-SNAPSHOT.pom
deleted file mode 100644
index e28f07cc..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/kmehr-model-1.34-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.34</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>
-                        ${project.basedir}/src/main/resources/
-                    </bindingDirectory>
-                    <bindingIncludes>
-                        <include>**/*.xjb</include>
-                    </bindingIncludes>
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index b51e1d16..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.34</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20210527123331</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20210527123331</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20210527123331</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/maven-metadata-local.xml
deleted file mode 100644
index 078dde81..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.34/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.34</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20210527123331</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/_remote.repositories
deleted file mode 100644
index b1d4660b..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Jun 21 10:45:28 CEST 2017
-kmehr-model-1.5-1.0-SNAPSHOT.pom>=
-kmehr-model-1.5-1.0-SNAPSHOT.jar>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/kmehr-model-1.5-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/kmehr-model-1.5-1.0-SNAPSHOT.jar
deleted file mode 100644
index b6ec825c..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/kmehr-model-1.5-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/kmehr-model-1.5-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/kmehr-model-1.5-1.0-SNAPSHOT.pom
deleted file mode 100644
index be46cee3..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/kmehr-model-1.5-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-    <artifactId>kmehr-model-1.5</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <!--<bindingDirectory>-->
-                        <!--${project.basedir}/src/main/resources/-->
-                    <!--</bindingDirectory>-->
-                    <!--<bindingIncludes>-->
-                        <!--<include>**/*.xjb</include>-->
-                    <!--</bindingIncludes>-->
-                    <schemaIncludes>
-                        <include>ehealth-kmehr/*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index f350ed7e..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.5</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20170621084528</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20170621084528</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20170621084528</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/resolver-status.properties b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 3d2da300..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.0-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Wed Jun 21 10:52:15 CEST 2017
-maven-metadata-my-local-repo.xml.error=
-maven-metadata-my-local-repo.xml.lastUpdated=1498035135288
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/_remote.repositories
deleted file mode 100644
index ec016686..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Fri Aug 04 14:54:01 CEST 2017
-kmehr1.5-1.1-SNAPSHOT.jar>=
-kmehr1.5-1.1-SNAPSHOT.pom>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/kmehr1.5-1.1-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/kmehr1.5-1.1-SNAPSHOT.jar
deleted file mode 100644
index 01fb2ed6..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/kmehr1.5-1.1-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/kmehr1.5-1.1-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/kmehr1.5-1.1-SNAPSHOT.pom
deleted file mode 100644
index 6c476419..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/kmehr1.5-1.1-SNAPSHOT.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>be.fgov.ehealth.standards</groupId>
-  <artifactId>kmehr1.5</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <description>POM was created from install:install-file</description>
-</project>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index 2c36f83c..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/1.1-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>be.fgov.ehealth.standards</groupId>
-  <artifactId>kmehr1.5</artifactId>
-  <version>1.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20170804125401</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20170804125401</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.1-SNAPSHOT</value>
-        <updated>20170804125401</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/maven-metadata-local.xml
deleted file mode 100644
index 24a5d4a3..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/kmehr/kmehr-model-1.5/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.kmehr</groupId>
-  <artifactId>kmehr-model-1.5</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20170621084528</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/_remote.repositories b/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/_remote.repositories
deleted file mode 100644
index dee9c424..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed Jul 04 13:58:52 CEST 2018
-sam-model-3.3-1.0-SNAPSHOT.jar>=
-sam-model-3.3-1.0-SNAPSHOT.pom>=
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/maven-metadata-local.xml
deleted file mode 100644
index 34133d43..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/maven-metadata-local.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.imec.ivlab.ehealth.sam</groupId>
-  <artifactId>sam-model-3.3</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20180704115852</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <extension>jar</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20180704115852</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>pom</extension>
-        <value>1.0-SNAPSHOT</value>
-        <updated>20180704115852</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/resolver-status.properties b/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/resolver-status.properties
deleted file mode 100644
index 28d2cff5..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/resolver-status.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an internal implementation file, its format can be changed without prior notice.
-#Wed Jul 04 13:17:32 CEST 2018
-maven-metadata-my-local-repo.xml.error=
-maven-metadata-my-local-repo.xml.lastUpdated=1530703052413
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/sam-model-3.3-1.0-SNAPSHOT.jar b/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/sam-model-3.3-1.0-SNAPSHOT.jar
deleted file mode 100644
index 71c3b003..00000000
Binary files a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/sam-model-3.3-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/sam-model-3.3-1.0-SNAPSHOT.pom b/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/sam-model-3.3-1.0-SNAPSHOT.pom
deleted file mode 100644
index 9baf910e..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/1.0-SNAPSHOT/sam-model-3.3-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.imec.ivlab.ehealth.sam</groupId>
-    <artifactId>sam-model-3.3</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <!-- mvn clean generate-sources -->
-    <!-- mvn clean install -->
-
-    <dependencies>
-
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.12.5</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
-                <configuration>
-                    <extension>true</extension>
-                    <schemaDirectory>src/main/resources</schemaDirectory>
-                    <bindingDirectory>
-                        ${project.basedir}/src/main/resources/
-                    </bindingDirectory>
-                    <bindingIncludes>
-                        <include>**/*.xjb</include>
-                    </bindingIncludes>
-                    <schemaIncludes>
-                        <include>*/*.xsd</include>
-                    </schemaIncludes>
-                    <generateDirectory>${basedir}/src/main/java</generateDirectory>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/maven-metadata-local.xml b/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/maven-metadata-local.xml
deleted file mode 100644
index 9e54e6d0..00000000
--- a/local-maven-repo/org/imec/ivlab/ehealth/sam/sam-model-3.3/maven-metadata-local.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.imec.ivlab.ehealth.sam</groupId>
-  <artifactId>sam-model-3.3</artifactId>
-  <versioning>
-    <versions>
-      <version>1.0-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20180704115852</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/_remote.repositories b/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/_remote.repositories
deleted file mode 100644
index 261636d6..00000000
--- a/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Fri Jul 07 12:30:05 CEST 2017
-probatron-modified-by-imec-1.0.jar>=
-probatron-modified-by-imec-1.0.pom>=
diff --git a/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/probatron-modified-by-imec-1.0.jar b/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/probatron-modified-by-imec-1.0.jar
deleted file mode 100644
index fd610a0e..00000000
Binary files a/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/probatron-modified-by-imec-1.0.jar and /dev/null differ
diff --git a/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/probatron-modified-by-imec-1.0.pom b/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/probatron-modified-by-imec-1.0.pom
deleted file mode 100644
index 42b7f176..00000000
--- a/local-maven-repo/org/probatron/probatron-modified-by-imec/1.0/probatron-modified-by-imec-1.0.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.probatron</groupId>
-  <artifactId>probatron-modified-by-imec</artifactId>
-  <version>1.0</version>
-  <description>POM was created from install:install-file</description>
-</project>
diff --git a/local-maven-repo/org/probatron/probatron-modified-by-imec/maven-metadata-local.xml b/local-maven-repo/org/probatron/probatron-modified-by-imec/maven-metadata-local.xml
deleted file mode 100644
index aa0e26bd..00000000
--- a/local-maven-repo/org/probatron/probatron-modified-by-imec/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.probatron</groupId>
-  <artifactId>probatron-modified-by-imec</artifactId>
-  <versioning>
-    <release>1.0</release>
-    <versions>
-      <version>1.0</version>
-    </versions>
-    <lastUpdated>20170707103005</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/local-maven-repo/org/probatron/probatron/0.7.4/_remote.repositories b/local-maven-repo/org/probatron/probatron/0.7.4/_remote.repositories
deleted file mode 100644
index 811c5450..00000000
--- a/local-maven-repo/org/probatron/probatron/0.7.4/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Wed May 03 13:52:03 CEST 2017
-probatron-0.7.4.pom>=
-probatron-0.7.4.jar>=
diff --git a/local-maven-repo/org/probatron/probatron/0.7.4/probatron-0.7.4.jar b/local-maven-repo/org/probatron/probatron/0.7.4/probatron-0.7.4.jar
deleted file mode 100644
index 44158529..00000000
Binary files a/local-maven-repo/org/probatron/probatron/0.7.4/probatron-0.7.4.jar and /dev/null differ
diff --git a/local-maven-repo/org/probatron/probatron/0.7.4/probatron-0.7.4.pom b/local-maven-repo/org/probatron/probatron/0.7.4/probatron-0.7.4.pom
deleted file mode 100644
index 6abcb2e1..00000000
--- a/local-maven-repo/org/probatron/probatron/0.7.4/probatron-0.7.4.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.probatron</groupId>
-  <artifactId>probatron</artifactId>
-  <version>0.7.4</version>
-  <description>POM was created from install:install-file</description>
-</project>
diff --git a/local-maven-repo/org/probatron/probatron/maven-metadata-local.xml b/local-maven-repo/org/probatron/probatron/maven-metadata-local.xml
deleted file mode 100644
index 0848e017..00000000
--- a/local-maven-repo/org/probatron/probatron/maven-metadata-local.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>org.probatron</groupId>
-  <artifactId>probatron</artifactId>
-  <versioning>
-    <release>0.7.4</release>
-    <versions>
-      <version>0.7.4</version>
-    </versions>
-    <lastUpdated>20170503115203</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/validator/pom.xml b/validator/pom.xml
index eb6fe5c3..414150ea 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -18,11 +18,6 @@
             <version>4.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.probatron</groupId>
-            <artifactId>probatron-modified-by-imec</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>