diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/ArchetypeSerializeUtils.java b/aom/src/main/java/com/nedap/archie/serializer/adl/ArchetypeSerializeUtils.java
index b2139c9c1..cfad94ef3 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/ArchetypeSerializeUtils.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/ArchetypeSerializeUtils.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ArchetypeSlotSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ArchetypeSlotSerializer.java
index 65bb3c036..144e1d6d7 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ArchetypeSlotSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ArchetypeSlotSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CArchetypeRootSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CArchetypeRootSerializer.java
index 59bd4a9ae..c9e991aeb 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CArchetypeRootSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CArchetypeRootSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CBooleanSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CBooleanSerializer.java
index 7c8e7c487..55849b3d9 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CBooleanSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CBooleanSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 import com.google.common.base.Joiner;
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CComplexObjectSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CComplexObjectSerializer.java
index 91884d561..7edb6d2b8 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CComplexObjectSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CComplexObjectSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 import com.google.common.base.Joiner;
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateSerializer.java
index 3ddca5e59..498e1f9bc 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateTimeSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateTimeSerializer.java
index d0d2fd8ff..04023273a 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateTimeSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDateTimeSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 import com.nedap.archie.aom.primitives.CDateTime;
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDurationSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDurationSerializer.java
index 70c2fcba0..e096ef79b 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDurationSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CDurationSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CIntegerSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CIntegerSerializer.java
index 5ff4432d9..037446e10 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CIntegerSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CIntegerSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CRealSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CRealSerializer.java
index 43263cfa4..954571c98 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CRealSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CRealSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CStringSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CStringSerializer.java
index 95b131bb2..8d04c1d67 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CStringSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CStringSerializer.java
@@ -1,29 +1,8 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
-import com.nedap.archie.aom.primitives.CBoolean;
-import com.nedap.archie.aom.primitives.CString;
-import com.nedap.archie.serializer.adl.ADLDefinitionSerializer;
+import com.nedap.archie.aom.primitives.*;
+import com.nedap.archie.serializer.adl.*;
 
 /**
  * @author Marko Pipan
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTerminologyCodeSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTerminologyCodeSerializer.java
index be1fdbcd5..39e7f6b71 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTerminologyCodeSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTerminologyCodeSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTimeSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTimeSerializer.java
index 309fada1f..c35805a8b 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTimeSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/CTimeSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ConstraintSerializer.java b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ConstraintSerializer.java
index ccf11543b..19ff2e680 100644
--- a/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ConstraintSerializer.java
+++ b/aom/src/main/java/com/nedap/archie/serializer/adl/constraints/ConstraintSerializer.java
@@ -1,23 +1,3 @@
-/*
- * ADL2-core
- * Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
- *
- * This file is part of ADL2-core.
- *
- * ADL2-core is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.nedap.archie.serializer.adl.constraints;
 
 
diff --git a/odin/src/test/resources/log4j2.xml b/odin/src/test/resources/log4j2.xml
index d0de37468..853e49347 100644
--- a/odin/src/test/resources/log4j2.xml
+++ b/odin/src/test/resources/log4j2.xml
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ ADL Designer
-  ~ Copyright (c) 2013-2014 Marand d.o.o. (www.marand.com)
-  ~
-  ~ This file is part of ADL2-tools.
-  ~
-  ~ ADL2-tools is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU Affero General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU Affero General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Affero General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
 
 <!-- Used only during the initialization, before logging is configured from apphome file. -->
 <Configuration status="INFO">