diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 517adbbef2aef965bee9260037d86cb218e3def4..0000000000000000000000000000000000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Maximilian Reininghaus, maximilian.reininghaus@kit.edu
-Ralf Ulrich, ralf.ulrich@kit.edu
-Felix Riehn, friehn@lip.pt
diff --git a/COAST/COASTProcess.cc b/COAST/COASTProcess.cc
index 815fde3bf8ee0c4c094fded33149d31c415391c9..827d2f0fa5b05ba2ee41f2bc11bdee1cca431abf 100644
--- a/COAST/COASTProcess.cc
+++ b/COAST/COASTProcess.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/COAST/COASTProcess.h b/COAST/COASTProcess.h
index 5e61b73726aee7be8a1d4751c06c58b4ccfe2185..2886d13c4d7973c70ac5ef4886a968f02842a206 100644
--- a/COAST/COASTProcess.h
+++ b/COAST/COASTProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/COAST/COASTStack.h b/COAST/COASTStack.h
index b3d6aad5440446dd3e844c6e8056b1d2788da47d..72e0594a78aaf0931e61cccadb198bcfeff172c9 100644
--- a/COAST/COASTStack.h
+++ b/COAST/COASTStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/COAST/COASTUserLib.cc b/COAST/COASTUserLib.cc
index 51cac0280f2fa5c478f4c77d0767e662b9a02bd2..d5b8b0b7c662a556f7d6fa6eb91bce147af6b829 100644
--- a/COAST/COASTUserLib.cc
+++ b/COAST/COASTUserLib.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/COAST/ParticleConversion.cc b/COAST/ParticleConversion.cc
index 2cbd738a87123d3f9ca585bac3747e274beae84b..de8ca909f819331f4a4afbde917a7a2829ebb048 100644
--- a/COAST/ParticleConversion.cc
+++ b/COAST/ParticleConversion.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/COAST/ParticleConversion.h b/COAST/ParticleConversion.h
index 65155d80b7c8b1e3e183d026bc62a1d6409a4057..68613783bbabfcfa55d4246b0473c0a1291cfcb5 100644
--- a/COAST/ParticleConversion.h
+++ b/COAST/ParticleConversion.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/boundary_example.cc b/Documentation/Examples/boundary_example.cc
index edc1faf9b67dfb155684ad392fa3f5ec6a4be512..549022b445973673e4e8f6ae1d2af23d51f077d4 100644
--- a/Documentation/Examples/boundary_example.cc
+++ b/Documentation/Examples/boundary_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc
index b46e402dc789c4e5b5d65b4bf40602e0d7414d4f..82c108e5c21472ec9ff30a15d89aad38e88e284f 100644
--- a/Documentation/Examples/cascade_example.cc
+++ b/Documentation/Examples/cascade_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/cascade_proton_example.cc b/Documentation/Examples/cascade_proton_example.cc
index 17cc88680c78c74f57b78cec9f66456301685922..434652440cdf0a053dec251647b2b8ca0506d357 100644
--- a/Documentation/Examples/cascade_proton_example.cc
+++ b/Documentation/Examples/cascade_proton_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/geometry_example.cc b/Documentation/Examples/geometry_example.cc
index 58fc3c20ec4a084497723305cf02ce458db80c3e..c4d55058be5218130659d7263fd39a5204e02969 100644
--- a/Documentation/Examples/geometry_example.cc
+++ b/Documentation/Examples/geometry_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/helix_example.cc b/Documentation/Examples/helix_example.cc
index 32a14c221fd896bda468e57c065a0bfcdb275b7e..61759311979810c76a656aa4808112be7a5a8a32 100644
--- a/Documentation/Examples/helix_example.cc
+++ b/Documentation/Examples/helix_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/logger_example.cc b/Documentation/Examples/logger_example.cc
index ce53b3a67aac4a85d8bc2d21ae63a5aba8f2f0d8..2596307b9a7ac3c9ff977a42481cbf0622b5f6b7 100644
--- a/Documentation/Examples/logger_example.cc
+++ b/Documentation/Examples/logger_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/particle_list_example.cc b/Documentation/Examples/particle_list_example.cc
index c83465f20014a242e9123e85c6b2f4e61ea7fc72..8fb4d45a84d3282fb3d893c296d48aed9ff63000 100644
--- a/Documentation/Examples/particle_list_example.cc
+++ b/Documentation/Examples/particle_list_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/stack_example.cc b/Documentation/Examples/stack_example.cc
index 6d8bd967fc9c1155fa3683997f4ad7ad031f3ab1..0b8d5b3a31cd2997cb5a689df8aa22c391f6eb2a 100644
--- a/Documentation/Examples/stack_example.cc
+++ b/Documentation/Examples/stack_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/staticsequence_example.cc b/Documentation/Examples/staticsequence_example.cc
index 11bb288d432dcb6df1132a08c083c2018b7b1f8c..8e8542829ea91132635f476a0f99498958f1e3ec 100644
--- a/Documentation/Examples/staticsequence_example.cc
+++ b/Documentation/Examples/staticsequence_example.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/stopping_power.cc b/Documentation/Examples/stopping_power.cc
index ffd1f05639b9112c7c6fb9eef3f54d8b51e7e3bf..a20e308984c286ac6cb7a4015f7d3da01edc4857 100644
--- a/Documentation/Examples/stopping_power.cc
+++ b/Documentation/Examples/stopping_power.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc
index f96362addfba2a3b5f3fd30e6070be1d33c4c4fb..a691e1408efd1cfdc71e46b97021c68d72509a3b 100644
--- a/Documentation/Examples/vertical_EAS.cc
+++ b/Documentation/Examples/vertical_EAS.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/BaseExponential.h b/Environment/BaseExponential.h
index 112b624269f597ece456babca69879a78fa8e48e..47391dc56deddc036318f8da5159e076daecbc11 100644
--- a/Environment/BaseExponential.h
+++ b/Environment/BaseExponential.h
@@ -1,14 +1,12 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
 
+
 #pragma once
 
 #include <corsika/geometry/Line.h>
diff --git a/Environment/DensityFunction.h b/Environment/DensityFunction.h
index 810a30495aeec1e368b024a6a449195a31a7dacd..5f61e26d7daf2502e47d8f6bc596d9cd484e5295 100644
--- a/Environment/DensityFunction.h
+++ b/Environment/DensityFunction.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/Environment.h b/Environment/Environment.h
index f0505dfa8d183a8be6301c64b59774d9069c813d..ef86670e8e35c1d772ecc88e80b6bfe3c1b84358 100644
--- a/Environment/Environment.h
+++ b/Environment/Environment.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/FlatExponential.h b/Environment/FlatExponential.h
index 2bc9c888088e3c62121674fa9c181b0143c68ff8..e1b0cd5b67c7976aee19f3642c02ea2c009b6ba6 100644
--- a/Environment/FlatExponential.h
+++ b/Environment/FlatExponential.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/HomogeneousMedium.h b/Environment/HomogeneousMedium.h
index e2dbf53d293f3b5fcaec24338e345cfc69bb57fb..49f4cb80d55f1fa229e0d324fa546db551a5f476 100644
--- a/Environment/HomogeneousMedium.h
+++ b/Environment/HomogeneousMedium.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/IMagneticFieldModel.h b/Environment/IMagneticFieldModel.h
index c34f1878b7926421b6d35d5aef7344a9f8b82266..a8c13b4e129d24916d75bd1f5f4f66121fc20be5 100644
--- a/Environment/IMagneticFieldModel.h
+++ b/Environment/IMagneticFieldModel.h
@@ -1,12 +1,11 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
+
 #pragma once
 
 #include <corsika/geometry/Point.h>
diff --git a/Environment/IMediumModel.h b/Environment/IMediumModel.h
index 0ed276f5c325aff04a88f29e625a2ab58c6fb8f3..c26650a055f9075f3d034820b4081f2dca11f6ae 100644
--- a/Environment/IMediumModel.h
+++ b/Environment/IMediumModel.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/IRefractiveIndexModel.h b/Environment/IRefractiveIndexModel.h
index 465dd43e16aead86c4f9a0de8d2a5e10a2eaf492..29037aca77256377ead6c8e79ce3e9a2652fa415 100644
--- a/Environment/IRefractiveIndexModel.h
+++ b/Environment/IRefractiveIndexModel.h
@@ -1,12 +1,11 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
+
 #pragma once
 
 #include <corsika/geometry/Point.h>
diff --git a/Environment/InhomogeneousMedium.h b/Environment/InhomogeneousMedium.h
index c92c90b9d07821bb888850b68a9b0e06c4dcc632..60f5919235c690345c3a9c7f57a2b44af59cc8e9 100644
--- a/Environment/InhomogeneousMedium.h
+++ b/Environment/InhomogeneousMedium.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/LayeredSphericalAtmosphereBuilder.cc b/Environment/LayeredSphericalAtmosphereBuilder.cc
index 86ee4dfc450796da863b7b7a72c53e45878b04dd..4f5b33857d19718e1b9502b11751e90aec5d1f7c 100644
--- a/Environment/LayeredSphericalAtmosphereBuilder.cc
+++ b/Environment/LayeredSphericalAtmosphereBuilder.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/LayeredSphericalAtmosphereBuilder.h b/Environment/LayeredSphericalAtmosphereBuilder.h
index f051485ca7de45460003628be03052a988995466..ad945cb8461a378145e1d3606461f30711dc69cf 100644
--- a/Environment/LayeredSphericalAtmosphereBuilder.h
+++ b/Environment/LayeredSphericalAtmosphereBuilder.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/LinearApproximationIntegrator.h b/Environment/LinearApproximationIntegrator.h
index 19c39de244c3d8b078e81d8a73fb40dfc05349d6..1224181f3a0e2d5fcb426eb7a70b6dd1f6a24026 100644
--- a/Environment/LinearApproximationIntegrator.h
+++ b/Environment/LinearApproximationIntegrator.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/NameModel.h b/Environment/NameModel.h
index d3fa608fe1e566c16243f06b8310b6585ff86560..d5b6ea4fe42d5dd69cd5bd9c56bb5721f09b06a8 100644
--- a/Environment/NameModel.h
+++ b/Environment/NameModel.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/NuclearComposition.h b/Environment/NuclearComposition.h
index e62ccb2cff13912cdb29b6302acda599bfbc0901..596302609af4beb6c4b93bc88d7be6fcea4142b5 100644
--- a/Environment/NuclearComposition.h
+++ b/Environment/NuclearComposition.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/ShowerAxis.cc b/Environment/ShowerAxis.cc
index c13fdd2972fecc9324d4aa07b165b5f77bba9916..fadc86ab352b5285021b4c6dfe4006e34ddab3a9 100644
--- a/Environment/ShowerAxis.cc
+++ b/Environment/ShowerAxis.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/ShowerAxis.h b/Environment/ShowerAxis.h
index be5c605b6e38ac8febc570345cecad23154ef224..a771e177da6644dfb429fee00db63459919ad240 100644
--- a/Environment/ShowerAxis.h
+++ b/Environment/ShowerAxis.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/SlidingPlanarExponential.h b/Environment/SlidingPlanarExponential.h
index 6217b5510547f17c2d4000c9808ef42cb6b1b680..305b8666c7b6ea3d60fa1964ad550106a2327532 100644
--- a/Environment/SlidingPlanarExponential.h
+++ b/Environment/SlidingPlanarExponential.h
@@ -1,14 +1,12 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
 
+
 #pragma once
 
 #include <corsika/environment/FlatExponential.h>
diff --git a/Environment/UniformMagneticField.h b/Environment/UniformMagneticField.h
index e75c0420d92b73b1ad8533a13df7b7ad6a62e6ee..f649afeb55d4507052dea5a9f4bdc9702687e581 100644
--- a/Environment/UniformMagneticField.h
+++ b/Environment/UniformMagneticField.h
@@ -1,12 +1,11 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
+
 #pragma once
 
 #include <corsika/environment/IMagneticFieldModel.h>
diff --git a/Environment/UniformRefractiveIndex.h b/Environment/UniformRefractiveIndex.h
index 030ef593798437aba2e9fb0047ac2d5ba4229386..84a43daabe1b26158aa17f201728863daa9574e1 100644
--- a/Environment/UniformRefractiveIndex.h
+++ b/Environment/UniformRefractiveIndex.h
@@ -1,12 +1,11 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
+
 #pragma once
 
 #include <corsika/environment/IRefractiveIndexModel.h>
diff --git a/Environment/VolumeTreeNode.h b/Environment/VolumeTreeNode.h
index 2eceee06caf1d3dfbfa84e83b79c1ff9a954fdfd..523eac4ecfc8861f33a4e0e8d3361b2224085d52 100644
--- a/Environment/VolumeTreeNode.h
+++ b/Environment/VolumeTreeNode.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 8e59c719747015a7b3b70afa1ab00ad3b8cd3652..55f316e1b5bfeb73a85aed6c2833447158d03754 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 18cf1cbba0c26e77fa00a32cec32d39794334f3f..5130bebcae714829c603c079c6fc4f1753c46429 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc
index 05e8898b6c214413c0591ed00ea7cfc0f18c09a7..9c132c904f4d9200656436896d08ec0cd989102f 100644
--- a/Framework/Cascade/testCascade.cc
+++ b/Framework/Cascade/testCascade.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Cascade/testCascade.h b/Framework/Cascade/testCascade.h
index 1d380aee390f0a710f88075566d3734f963c46b5..41a96ee3e7829aedd3033f7fd8f33c3679cb810d 100644
--- a/Framework/Cascade/testCascade.h
+++ b/Framework/Cascade/testCascade.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/BaseTrajectory.h b/Framework/Geometry/BaseTrajectory.h
index 42dd55339e0105f8899f60a9e60ec79ba2ebe3b0..6d61e2eeb820064afc1d7f51c9b991e930960e93 100644
--- a/Framework/Geometry/BaseTrajectory.h
+++ b/Framework/Geometry/BaseTrajectory.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/BaseVector.h b/Framework/Geometry/BaseVector.h
index e2de575eae14a1b24a6aa014fb5afbfbbc7c7f55..f66ee84e2e6d4888d2d848a76590dcbf522ca981 100644
--- a/Framework/Geometry/BaseVector.h
+++ b/Framework/Geometry/BaseVector.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/CoordinateSystem.cc b/Framework/Geometry/CoordinateSystem.cc
index 49a35724e8e4767e5859a953569e8450b4b23182..e822267277f9542ba64d7e745691aee986eac62d 100644
--- a/Framework/Geometry/CoordinateSystem.cc
+++ b/Framework/Geometry/CoordinateSystem.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/CoordinateSystem.h b/Framework/Geometry/CoordinateSystem.h
index 0f4e007eb937a778e890921fb486ffd00b104a4a..bc9ecd9a2bcacf5625437aa4ffab19ec9c8a171b 100644
--- a/Framework/Geometry/CoordinateSystem.h
+++ b/Framework/Geometry/CoordinateSystem.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/FourVector.h b/Framework/Geometry/FourVector.h
index 8f3eadfe6adc50e5f781891d5f6a48b0eca83c0e..418575b07df02d09b236f504f97ddb32980f224f 100644
--- a/Framework/Geometry/FourVector.h
+++ b/Framework/Geometry/FourVector.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Helix.h b/Framework/Geometry/Helix.h
index 2686e01f7191e6da350ffcd0f46f1a51833fe298..01fd0e0f289d978fa8cd69bfaf46031b8a5b2116 100644
--- a/Framework/Geometry/Helix.h
+++ b/Framework/Geometry/Helix.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Line.h b/Framework/Geometry/Line.h
index eca0ad59e034115c5da174be7fa4ec6c841464b9..fd0835308e7f1ca4cb9e0c2192988212eafb0326 100644
--- a/Framework/Geometry/Line.h
+++ b/Framework/Geometry/Line.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Plane.h b/Framework/Geometry/Plane.h
index 3575dde93a43ed91b5557752deb17226b67638b3..9a3b04ff45a5b48cded875474c6eaad9bb6d100b 100644
--- a/Framework/Geometry/Plane.h
+++ b/Framework/Geometry/Plane.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Point.h b/Framework/Geometry/Point.h
index 7c59024d74b6ca3ecfb8fb6b6f9c194746491fc7..20e46032c12b341dfce300ff326c247f4da76b67 100644
--- a/Framework/Geometry/Point.h
+++ b/Framework/Geometry/Point.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/QuantityVector.h b/Framework/Geometry/QuantityVector.h
index bc9180757a8aeb758efeed393e2e3f8599d32fc5..b45138bf76eeb7a7a3e653a9df3f7e7a0a828930 100644
--- a/Framework/Geometry/QuantityVector.h
+++ b/Framework/Geometry/QuantityVector.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/RootCoordinateSystem.h b/Framework/Geometry/RootCoordinateSystem.h
index 4ccd5673ddc7a9b4430e3c6ab8fcbced2ac6902b..a2208fd716c11279dcdf119220b02b8d3e99e6d6 100644
--- a/Framework/Geometry/RootCoordinateSystem.h
+++ b/Framework/Geometry/RootCoordinateSystem.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Sphere.h b/Framework/Geometry/Sphere.h
index bc8c9282507e28b6daefdd503310bb1d16514585..52d3909c39a68bc48105afe829c95a02be9067d0 100644
--- a/Framework/Geometry/Sphere.h
+++ b/Framework/Geometry/Sphere.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Trajectory.h b/Framework/Geometry/Trajectory.h
index 71135d4c82e81d51bb93eb497906147828da01c3..1f9c247605de885fc1127cf3bf96843ba8997c85 100644
--- a/Framework/Geometry/Trajectory.h
+++ b/Framework/Geometry/Trajectory.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Vector.h b/Framework/Geometry/Vector.h
index 927c36180d42408e25f0778bf9356e1f95eede01..8be8fcfefa6b6716157233a7bcebafd1f9f0387c 100644
--- a/Framework/Geometry/Vector.h
+++ b/Framework/Geometry/Vector.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/Volume.h b/Framework/Geometry/Volume.h
index a51219110f695822b32e251416ae1d655a17b3a9..c1dfbd3130765f169344ccd421399eaeca2a93ac 100644
--- a/Framework/Geometry/Volume.h
+++ b/Framework/Geometry/Volume.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/testFourVector.cc b/Framework/Geometry/testFourVector.cc
index c84d40c16bbb810c7bde778e14c1e85e6cefe2a0..4c169258290efe3220829027535ff329b6b4142b 100644
--- a/Framework/Geometry/testFourVector.cc
+++ b/Framework/Geometry/testFourVector.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Geometry/testGeometry.cc b/Framework/Geometry/testGeometry.cc
index 002eb6d5e478d136f7395e5ede98396d67ae3a48..6211b3cc4366a1ea78fcaefbdd326f0078adda0f 100644
--- a/Framework/Geometry/testGeometry.cc
+++ b/Framework/Geometry/testGeometry.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/BufferedSink.h b/Framework/Logging/BufferedSink.h
index ae9bc080f61514b0c8ae6b4b9ff135775eb70723..26aeb6c5a94bbe029b017bb00498650b10d37c64 100644
--- a/Framework/Logging/BufferedSink.h
+++ b/Framework/Logging/BufferedSink.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/Logger.h b/Framework/Logging/Logger.h
index cceff44f96b2d8d6b8d03cca13e2e8abed04355e..ae688460f236a02476b8d3a062a4dec3f9243328 100644
--- a/Framework/Logging/Logger.h
+++ b/Framework/Logging/Logger.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/MessageOff.h b/Framework/Logging/MessageOff.h
index ccdc92e6f5eff637fd66ebb0c59221cb6f88f217..e25a8b30af8c89af870230837d4d1e784b3355be 100644
--- a/Framework/Logging/MessageOff.h
+++ b/Framework/Logging/MessageOff.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/MessageOn.h b/Framework/Logging/MessageOn.h
index c7b2e8d02f0094699f800ef5c89f4a4ac50cf328..6c34936bf90a6e8eaecfae155482ad848eb85d57 100644
--- a/Framework/Logging/MessageOn.h
+++ b/Framework/Logging/MessageOn.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/NoSink.h b/Framework/Logging/NoSink.h
index 0f4be8914b88b5e70d7f3193873efcb04aae880c..122cc255fd86275de8fc3a84b7e01a75e41dff31 100644
--- a/Framework/Logging/NoSink.h
+++ b/Framework/Logging/NoSink.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/Sink.h b/Framework/Logging/Sink.h
index c050f22427cd15ef6e3295706e3ed0855711c771..be99c3c637c144cadbf6cd36f8f72741f4a8449c 100644
--- a/Framework/Logging/Sink.h
+++ b/Framework/Logging/Sink.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Logging/testLogging.cc b/Framework/Logging/testLogging.cc
index 7cb87ba5ccf0868320b8a7294d6be5ab5d36f7b8..2186894b7e570a481af968ed6d9e08ea53517dc9 100644
--- a/Framework/Logging/testLogging.cc
+++ b/Framework/Logging/testLogging.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Particles/ParticleProperties.cc b/Framework/Particles/ParticleProperties.cc
index 0f572ca24176392129e6ebd2956d2aadb83f0bc1..a52883bf83b14a97a7a732a700db59eaf502cd8b 100644
--- a/Framework/Particles/ParticleProperties.cc
+++ b/Framework/Particles/ParticleProperties.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Particles/ParticleProperties.h b/Framework/Particles/ParticleProperties.h
index c0be35879896bba8aaf4825fbb22157160b40d0f..d184e7544257a2bdf700a3d267495e4d34d7f862 100644
--- a/Framework/Particles/ParticleProperties.h
+++ b/Framework/Particles/ParticleProperties.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Particles/testParticles.cc b/Framework/Particles/testParticles.cc
index c208c7f4204a586bfe9d1f346993ca9a99a23800..e01f0b1fb8f93ab0db33c4cf4b270eab19720fbb 100644
--- a/Framework/Particles/testParticles.cc
+++ b/Framework/Particles/testParticles.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index bf3c26e2242b59b42630e76830cd31dc6d27ea1c..eeb4da07633674ed049b33778839bef486633316 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/BoundaryCrossingProcess.h b/Framework/ProcessSequence/BoundaryCrossingProcess.h
index cf3eb6223a6f83d72adf64d8e5c6dc7240f569c0..c0793e2b6b126ed5c2cac1b6765ce01221143312 100644
--- a/Framework/ProcessSequence/BoundaryCrossingProcess.h
+++ b/Framework/ProcessSequence/BoundaryCrossingProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index 37ac71adbc4b98638de2912cf4e7001ac0c5faca..b8d2f52211da1c6f6d56e04a398258278b40c758 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/DecayProcess.h b/Framework/ProcessSequence/DecayProcess.h
index ce7b554953accf84c204a4962d09c7ae4dbe6260..fb5ae9eb9ca881bc41c076e9f852a865059ff269 100644
--- a/Framework/ProcessSequence/DecayProcess.h
+++ b/Framework/ProcessSequence/DecayProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/InteractionProcess.h b/Framework/ProcessSequence/InteractionProcess.h
index 8268dc2fbb1aaa5a293205e7925227e111355960..ec3a086297caf09cdfddb29ea49acbb1346f36e7 100644
--- a/Framework/ProcessSequence/InteractionProcess.h
+++ b/Framework/ProcessSequence/InteractionProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/ProcessReturn.h b/Framework/ProcessSequence/ProcessReturn.h
index ce6701030f3a301a74d4919513933ed74017e1de..bef2c12d70858a7626ec4384468f5e10feed0ca3 100644
--- a/Framework/ProcessSequence/ProcessReturn.h
+++ b/Framework/ProcessSequence/ProcessReturn.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/ProcessSequence.h b/Framework/ProcessSequence/ProcessSequence.h
index 12cfae778f3c3dbce2e98ce7377b10876a322732..69a4da36b183a1f31c132e80136f30fc09a68eae 100644
--- a/Framework/ProcessSequence/ProcessSequence.h
+++ b/Framework/ProcessSequence/ProcessSequence.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/ProcessSignature.h b/Framework/ProcessSequence/ProcessSignature.h
index 68b2889b1da3eb951a7ca909b8e01e112ffafaac..346e8a33cc2bb3898c5cce5153cac573d4ee7bd0 100644
--- a/Framework/ProcessSequence/ProcessSignature.h
+++ b/Framework/ProcessSequence/ProcessSignature.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/SecondariesProcess.h b/Framework/ProcessSequence/SecondariesProcess.h
index ff9567ccc121810efb8ae3bb390bca9c15442b36..3a8f35c74fc6718dd03d81d8edcf840be1d9b316 100644
--- a/Framework/ProcessSequence/SecondariesProcess.h
+++ b/Framework/ProcessSequence/SecondariesProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/StackProcess.h b/Framework/ProcessSequence/StackProcess.h
index 61c51e3393d3d58b11b48df9fe777689ec47d559..05d3583963f8e0d882290c4e84924728023a3ee4 100644
--- a/Framework/ProcessSequence/StackProcess.h
+++ b/Framework/ProcessSequence/StackProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/ProcessSequence/testProcessSequence.cc b/Framework/ProcessSequence/testProcessSequence.cc
index 7dd6c60e74032a7d60672260056665534279ec7d..1b46c9662a2e83307987a5b160a8ee44236171ce 100644
--- a/Framework/ProcessSequence/testProcessSequence.cc
+++ b/Framework/ProcessSequence/testProcessSequence.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Random/ExponentialDistribution.h b/Framework/Random/ExponentialDistribution.h
index 4c58c8869a326638cb4b0cb6ffae4395d6e51851..2431e316e1465ba669610993b127b4aeef735c9e 100644
--- a/Framework/Random/ExponentialDistribution.h
+++ b/Framework/Random/ExponentialDistribution.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Random/RNGManager.cc b/Framework/Random/RNGManager.cc
index 1291dfd44f02300e06bccdcc9f9fc0c376ab2d56..ab60ff721f876d728a2f4ee04e3a31b33d121d43 100644
--- a/Framework/Random/RNGManager.cc
+++ b/Framework/Random/RNGManager.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Random/RNGManager.h b/Framework/Random/RNGManager.h
index b2bedf33d021320e2fa423ebcdb9e94da196b6a5..15e90d69a294824a3e58d0e60eab38d4ebd37e07 100644
--- a/Framework/Random/RNGManager.h
+++ b/Framework/Random/RNGManager.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Random/UniformRealDistribution.h b/Framework/Random/UniformRealDistribution.h
index 53c28bfbf361ae10b60ada35caf7ccc68ab81a8b..7e092076da1ea7d179df5313a9d767f9e38faf9f 100644
--- a/Framework/Random/UniformRealDistribution.h
+++ b/Framework/Random/UniformRealDistribution.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Random/testRandom.cc b/Framework/Random/testRandom.cc
index 2b5a24a67c72a3bc02caddbe900b16f3a43a0b78..9a1d96fbb7a1dd426643a4fe4eba51c65403330a 100644
--- a/Framework/Random/testRandom.cc
+++ b/Framework/Random/testRandom.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/CombinedStack.h b/Framework/StackInterface/CombinedStack.h
index ee3409e79aadd2891e0ddae5b74f365a31422b03..f971b64a7da0189142bc6bc568aed16b1a867180 100644
--- a/Framework/StackInterface/CombinedStack.h
+++ b/Framework/StackInterface/CombinedStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/ParticleBase.h b/Framework/StackInterface/ParticleBase.h
index dfd4afc7c1e2ef75149de70764742d10febed2f8..9bda7aebb821cc450604dd9e5d4a42731febe2b1 100644
--- a/Framework/StackInterface/ParticleBase.h
+++ b/Framework/StackInterface/ParticleBase.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/SecondaryView.h b/Framework/StackInterface/SecondaryView.h
index 091c889546bf8f4e8e2e7ea5d19bdd01b7292999..077e56ea2dff557ac0c7f43dc7f9446a2fa0caaf 100644
--- a/Framework/StackInterface/SecondaryView.h
+++ b/Framework/StackInterface/SecondaryView.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index 0e19a243178d22584fc60561d97ff03fa05e2ab0..7ddee326c7947cd905ab58907e024afeef1b4bd3 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/StackIteratorInterface.h b/Framework/StackInterface/StackIteratorInterface.h
index 4b0c283a174b8829c1d9b990dacef3db8872d474..5213e30d4cead0cf5f2170f3a70cdc03c2974e3a 100644
--- a/Framework/StackInterface/StackIteratorInterface.h
+++ b/Framework/StackInterface/StackIteratorInterface.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/testCombinedStack.cc b/Framework/StackInterface/testCombinedStack.cc
index 2ad1e817dcc94a50ce818948aa58f850be6fe1f2..d728abeb4019bfb206c7343ec51e76a3b9b10edb 100644
--- a/Framework/StackInterface/testCombinedStack.cc
+++ b/Framework/StackInterface/testCombinedStack.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/testSecondaryView.cc b/Framework/StackInterface/testSecondaryView.cc
index 8e2ac0e9e0677a0025e326b2d658c5884beab12d..356a0bd5555b8a9274dc206cd1da064153764dc8 100644
--- a/Framework/StackInterface/testSecondaryView.cc
+++ b/Framework/StackInterface/testSecondaryView.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/testStackInterface.cc b/Framework/StackInterface/testStackInterface.cc
index 99567943a5ea52133f457b165cd82daa13ac5dc4..1ef504f60255ec5a45d540560f6e9fc19822bc29 100644
--- a/Framework/StackInterface/testStackInterface.cc
+++ b/Framework/StackInterface/testStackInterface.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/StackInterface/testTestStack.h b/Framework/StackInterface/testTestStack.h
index c2b309b0699191ddae3f3bd13d4e84e998a09733..89897b96a3d7db78c0016a4416fff316f7d68083 100644
--- a/Framework/StackInterface/testTestStack.h
+++ b/Framework/StackInterface/testTestStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Testing/TestMain.cc b/Framework/Testing/TestMain.cc
index da6f2c3f1a0f72b5af0d49771b908c57e6b51d3b..fa52fa804f307c546f628b7ccd5d14401b6f0adb 100644
--- a/Framework/Testing/TestMain.cc
+++ b/Framework/Testing/TestMain.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Units/PhysicalConstants.h b/Framework/Units/PhysicalConstants.h
index cd1463dd35d42ff43738fdf921016a39282b7067..f47b917e6919762d7b1c73a950192c086e7afe4b 100644
--- a/Framework/Units/PhysicalConstants.h
+++ b/Framework/Units/PhysicalConstants.h
@@ -1,7 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
  *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index cb753cd53dac635aae2bc34f984e18b082951e60..06ca5374fbfb5a8e334c1634b0c697f75819d4cd 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc
index 5f93d37be2f726bd9907383fa9fffce72babcdf6..9f033d243f66c41deb044a912d08dbc3d2d5d003 100644
--- a/Framework/Units/testUnits.cc
+++ b/Framework/Units/testUnits.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/Bit.h b/Framework/Utilities/Bit.h
index 7d5030e0fa61f2308d712d870f42ee1f00eec386..1443ddf9b3a06acd6c434180ca7c103e1d5914d7 100644
--- a/Framework/Utilities/Bit.h
+++ b/Framework/Utilities/Bit.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/COMBoost.cc b/Framework/Utilities/COMBoost.cc
index abdb7a48b88f733aba4c03dc4d8521a741aa27b5..c6688199ab5d543cfd1670b93e7416cbd8a961f7 100644
--- a/Framework/Utilities/COMBoost.cc
+++ b/Framework/Utilities/COMBoost.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/COMBoost.h b/Framework/Utilities/COMBoost.h
index b69202134db8447f2e14ebfd285131c6eb57ff95..0c78d49acb6ef06dd41c1e64c7f5048172c1e34a 100644
--- a/Framework/Utilities/COMBoost.h
+++ b/Framework/Utilities/COMBoost.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/CorsikaData.cc b/Framework/Utilities/CorsikaData.cc
index 5b0c1efc9a56cc60016e82152b95f676d9b1723f..5cb58ea7660a033262404a6433767871e264dd73 100644
--- a/Framework/Utilities/CorsikaData.cc
+++ b/Framework/Utilities/CorsikaData.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/CorsikaData.h b/Framework/Utilities/CorsikaData.h
index cf8d0e6f356dd25cc49761decef4ea91c3c24738..ed635f806c7cc5d8b6ad872c2cab28243183d091 100644
--- a/Framework/Utilities/CorsikaData.h
+++ b/Framework/Utilities/CorsikaData.h
@@ -1,12 +1,11 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
+
 #ifndef CORSIKA_CORSIKADATA_H
 #define CORSIKA_CORSIKADATA_H
 
diff --git a/Framework/Utilities/CorsikaFenv.h b/Framework/Utilities/CorsikaFenv.h
index 98a98c84db5cb66dd7140499a522029c2c72e0f8..02614eceddce18d0fa94ca1a7d964386471c5eea 100644
--- a/Framework/Utilities/CorsikaFenv.h
+++ b/Framework/Utilities/CorsikaFenv.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/CorsikaFenvDefault.cc b/Framework/Utilities/CorsikaFenvDefault.cc
index 228bf54f5184710d2344d80b52730c8f22ba0db4..4d3426ad6b6c2b3c40e51d7103cec38b5ec12b87 100644
--- a/Framework/Utilities/CorsikaFenvDefault.cc
+++ b/Framework/Utilities/CorsikaFenvDefault.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/CorsikaFenvFallback.cc b/Framework/Utilities/CorsikaFenvFallback.cc
index 8aa130b73481c79782b368ed98035dbfd8eecd2c..64327b2c7b7500b6925a86a4ec8997aebeec6f15 100644
--- a/Framework/Utilities/CorsikaFenvFallback.cc
+++ b/Framework/Utilities/CorsikaFenvFallback.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/MetaProgramming.h b/Framework/Utilities/MetaProgramming.h
index dfef000e04ddcb29876ab98a2457d11d596696a3..689357769ebf357fe6cd085a1336e71d89a4fbb0 100644
--- a/Framework/Utilities/MetaProgramming.h
+++ b/Framework/Utilities/MetaProgramming.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/Singleton.h b/Framework/Utilities/Singleton.h
index e8c3b99b0302798f32b9f445dc0ca478bdc299f9..68667df8d82a0090639b528daac1f19bf392c4ce 100644
--- a/Framework/Utilities/Singleton.h
+++ b/Framework/Utilities/Singleton.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/sgn.h b/Framework/Utilities/sgn.h
index f192d51bfdab504595e4f7dac8eaeaedc70076f7..2cc3a936b2f326835e46ad1ed4a96fb63080975f 100644
--- a/Framework/Utilities/sgn.h
+++ b/Framework/Utilities/sgn.h
@@ -1,7 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
  *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
diff --git a/Framework/Utilities/testCOMBoost.cc b/Framework/Utilities/testCOMBoost.cc
index 2f5c7c62f25735756de4c103cd6ffc4895168b84..b6b677d23b62d21c01a1783be81d6f76cdce76b7 100644
--- a/Framework/Utilities/testCOMBoost.cc
+++ b/Framework/Utilities/testCOMBoost.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/testCorsikaFenv.cc b/Framework/Utilities/testCorsikaFenv.cc
index 1049e5164d757197c45848fef67098d4246321cf..ebfde1043070e84f9bf79b6f5c227b6f66686a6d 100644
--- a/Framework/Utilities/testCorsikaFenv.cc
+++ b/Framework/Utilities/testCorsikaFenv.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Framework/Utilities/try_feenableexcept.cc b/Framework/Utilities/try_feenableexcept.cc
index 0e12cf8d461acebe521cf72b3c851a565fc5f553..d70dbebadff7a8ba3841daa65a7f51c333a5cafa 100644
--- a/Framework/Utilities/try_feenableexcept.cc
+++ b/Framework/Utilities/try_feenableexcept.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 0000000000000000000000000000000000000000..7abdfeb5062a5e3716cdf975087a81c1fa7d7ed7
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,30 @@
+Maintainers of the CORSIKA8 project are collaborators actively taking
+care of code contributions, quality control, development, and related
+discussions. 
+
+General:
+- Ralf Ulrich <ralf.ulrich@kit.edu>, KIT
+- Maximilian Reininghaus <maximilian.reininghaus@kit.edu>, KIT
+- Hans Dembinski <hdembins@mpi-hd.mpg.de>, Dortmund
+
+High performance, GPU: 
+- Dominik Baack <dominik.baack@tu-dortmund.de>, Dortmund
+- Antonio Augusto Alves Junior <antonio.junior@kit.edu>, KIT
+- Luisa Arrabito <arrabito@in2p3.fr>, Montpellier
+
+Electromagnetic models, and infrastructure: 
+- Jean-Marco Alameddine <gitlab@gitlab.ikp.kit.edu>, Dortmund
+- Jan Soedingrekso <jan.soedingrekso@tu-dortmund.de>, Dortmund
+- Maximilian Sackel <maximilian.sackel@udo.edu>, Dortmund
+
+Hadron models and infrastructure:
+- Felix Riehn <friehn@lip.pt>, Santiago/Lisbon
+- Anatoli Fedynitch <anatoli.fedynitch@icecube.wisc.edu> ICRR Tokyo
+
+Radio:
+- Remy Prechelt <prechelt@hawaii.edu> 
+- Tim Huege <tim.huege@kit.edu>, KIT
+
+Testing, containers:
+- Lukas Nellen <lukas@nucleares.unam.mx>
+
diff --git a/Main/shower.cc b/Main/shower.cc
index 05a5e9bd9ee1c69400167849d114d42177a1ff06..4ef4c186d1094efe966b7d600ece343724b1d018 100644
--- a/Main/shower.cc
+++ b/Main/shower.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/EnergyLoss/EnergyLoss.cc b/Processes/EnergyLoss/EnergyLoss.cc
index 9bc1d8e86032a36e76c197f32f2b8c753df84eb2..0922e473edeaf99bdfce1944b620913a515d6b84 100644
--- a/Processes/EnergyLoss/EnergyLoss.cc
+++ b/Processes/EnergyLoss/EnergyLoss.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/EnergyLoss/EnergyLoss.h b/Processes/EnergyLoss/EnergyLoss.h
index 82372dd7807a55c4125bdd9be5e2790381fc3222..584a80ff96f3032a9e083713fbecc0ba961a8537 100644
--- a/Processes/EnergyLoss/EnergyLoss.h
+++ b/Processes/EnergyLoss/EnergyLoss.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.cc b/Processes/HadronicElasticModel/HadronicElasticModel.cc
index 9267fcaf989cbd8dd94f278d7c6b4c4d3cd26193..baddab65f5299250029d30d8bc19bc0b295ad936 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.cc
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.h b/Processes/HadronicElasticModel/HadronicElasticModel.h
index 4fc92d5d4db66f318ae8f629b98ac2f378389ddc..17af624a48d1bfaa605baa4becd76ebad16b7918 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.h
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/InteractionCounter/InteractionCounter.h b/Processes/InteractionCounter/InteractionCounter.h
index 985b3e137c197aa0f5c3cf33548796317d86f848..2adaefd9d2521e77109f51fb1a5dc66ece72774e 100644
--- a/Processes/InteractionCounter/InteractionCounter.h
+++ b/Processes/InteractionCounter/InteractionCounter.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/InteractionCounter/InteractionHistogram.cc b/Processes/InteractionCounter/InteractionHistogram.cc
index 61ed9d5c8f6ce972146bb656a92ba0d6e533f3bd..583184b0765fe470b3a2c53b2c5855ade0fa9fec 100644
--- a/Processes/InteractionCounter/InteractionHistogram.cc
+++ b/Processes/InteractionCounter/InteractionHistogram.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/InteractionCounter/InteractionHistogram.h b/Processes/InteractionCounter/InteractionHistogram.h
index 98fedae84ee5b101e3904b2d1d18e5dc26e29d32..9d060a4ef85f73a2165567f15d53359572543ff6 100644
--- a/Processes/InteractionCounter/InteractionHistogram.h
+++ b/Processes/InteractionCounter/InteractionHistogram.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/InteractionCounter/testInteractionCounter.cc b/Processes/InteractionCounter/testInteractionCounter.cc
index 24518416aece74d2547b46d31ba6bf45e54f6b4d..880e86f5c83379e1cf6d25a0360172647ba5cd8b 100644
--- a/Processes/InteractionCounter/testInteractionCounter.cc
+++ b/Processes/InteractionCounter/testInteractionCounter.cc
@@ -1,14 +1,12 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
 
+
 #include <corsika/process/interaction_counter/InteractionCounter.h>
 
 #include <corsika/environment/Environment.h>
diff --git a/Processes/LongitudinalProfile/LongitudinalProfile.cc b/Processes/LongitudinalProfile/LongitudinalProfile.cc
index 75b06031ca2a05061d273c99caaeb20872eccb72..9977b4340b42ade20846f34b27a3bee122783ab2 100644
--- a/Processes/LongitudinalProfile/LongitudinalProfile.cc
+++ b/Processes/LongitudinalProfile/LongitudinalProfile.cc
@@ -1,7 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
  *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
diff --git a/Processes/LongitudinalProfile/LongitudinalProfile.h b/Processes/LongitudinalProfile/LongitudinalProfile.h
index fcf9b246383beb7fa11bd695106b7499571e744c..54adf87bdc10eb0bc6373fe138775575fe623c73 100644
--- a/Processes/LongitudinalProfile/LongitudinalProfile.h
+++ b/Processes/LongitudinalProfile/LongitudinalProfile.h
@@ -1,7 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
  *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
diff --git a/Processes/NullModel/NullModel.cc b/Processes/NullModel/NullModel.cc
index 2e2861dc9375d3340dd4da1c56459b654fc463dd..a5666de98a59ec689c1b7330ffaa48518e5746b6 100644
--- a/Processes/NullModel/NullModel.cc
+++ b/Processes/NullModel/NullModel.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/NullModel/NullModel.h b/Processes/NullModel/NullModel.h
index 18ac43654aaac5000fc8063c15b90c8ee53ba2b3..9c9f610b735d3aa6c1bce62f157ef909285116a3 100644
--- a/Processes/NullModel/NullModel.h
+++ b/Processes/NullModel/NullModel.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/NullModel/testNullModel.cc b/Processes/NullModel/testNullModel.cc
index d170a0de1221bca1e2f0b8f43c4cc4d43fc09cff..c449c4ac621614b8b152ac2456727fe1b308f8d9 100644
--- a/Processes/NullModel/testNullModel.cc
+++ b/Processes/NullModel/testNullModel.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/ObservationPlane/ObservationPlane.cc b/Processes/ObservationPlane/ObservationPlane.cc
index 8269294cc86ab6ee0d91c10668f58defa2da8e24..9907d3ef8ef7755031f6c2bd8b6473bcf94ac17f 100644
--- a/Processes/ObservationPlane/ObservationPlane.cc
+++ b/Processes/ObservationPlane/ObservationPlane.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/ObservationPlane/ObservationPlane.h b/Processes/ObservationPlane/ObservationPlane.h
index 377d8a1bd82d1996aaacedc2f965f9dd42539b0b..34b973e66a1d1cf1d8f826c63f8ee5fbb5e2c4df 100644
--- a/Processes/ObservationPlane/ObservationPlane.h
+++ b/Processes/ObservationPlane/ObservationPlane.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/ObservationPlane/testObservationPlane.cc b/Processes/ObservationPlane/testObservationPlane.cc
index 957a06b97a2ce2253a3f9cb442d774541f4d9084..426db4657984d5134d7416b2670d54b754dd0819 100644
--- a/Processes/ObservationPlane/testObservationPlane.cc
+++ b/Processes/ObservationPlane/testObservationPlane.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/OnShellCheck/OnShellCheck.cc b/Processes/OnShellCheck/OnShellCheck.cc
index f47f94d258feec91e13a87878306c47f76cc796f..6ad035d14cac0a3f5f17a06397c9f07633e0db83 100644
--- a/Processes/OnShellCheck/OnShellCheck.cc
+++ b/Processes/OnShellCheck/OnShellCheck.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/OnShellCheck/OnShellCheck.h b/Processes/OnShellCheck/OnShellCheck.h
index d51d5e8f7d204dd37d84c72ba73d8eb66c233e4a..940c705e2500b1c219c78bf24bae8728f18d2b10 100644
--- a/Processes/OnShellCheck/OnShellCheck.h
+++ b/Processes/OnShellCheck/OnShellCheck.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/OnShellCheck/testOnShellCheck.cc b/Processes/OnShellCheck/testOnShellCheck.cc
index ca2c564553b55d078907379c7067881d0071336f..cfc7d159b5a7884a56dd45e19ee8c8c42f35901d 100644
--- a/Processes/OnShellCheck/testOnShellCheck.cc
+++ b/Processes/OnShellCheck/testOnShellCheck.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/ParticleCut/ParticleCut.cc b/Processes/ParticleCut/ParticleCut.cc
index 5783c05fd32e31b691bb930931d9c98e49509dae..d10dbf74b9e28a5872e617dd8e28394ad822cd19 100644
--- a/Processes/ParticleCut/ParticleCut.cc
+++ b/Processes/ParticleCut/ParticleCut.cc
@@ -1,14 +1,12 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
 
+
 #include <corsika/process/particle_cut/ParticleCut.h>
 
 using namespace std;
diff --git a/Processes/ParticleCut/ParticleCut.h b/Processes/ParticleCut/ParticleCut.h
index e0c78f8818c51e677b0ce5df673fa8cb3ec7e28a..8ecf7917a7230aef67889cde73ba125a5438de98 100644
--- a/Processes/ParticleCut/ParticleCut.h
+++ b/Processes/ParticleCut/ParticleCut.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/ParticleCut/testParticleCut.cc b/Processes/ParticleCut/testParticleCut.cc
index 2375600c8bacb5908950dbeab0efdd0b46c19b3f..9c98697f099399541c768b44d75a12c19c079b1f 100644
--- a/Processes/ParticleCut/testParticleCut.cc
+++ b/Processes/ParticleCut/testParticleCut.cc
@@ -1,14 +1,12 @@
-
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
  */
 
+
 #include <corsika/process/particle_cut/ParticleCut.h>
 
 #include <corsika/environment/Environment.h>
diff --git a/Processes/Pythia/Decay.cc b/Processes/Pythia/Decay.cc
index a17678d18c9932a1f6417f792ab5cb0e40946f6a..21f9d92a25a08c251006bb0593cda8ea0550a115 100644
--- a/Processes/Pythia/Decay.cc
+++ b/Processes/Pythia/Decay.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Pythia/Decay.h b/Processes/Pythia/Decay.h
index 70573a2bfd0e8963d2956a68d712ab66e6fa47d2..4e2d423a2f2ac8037feb4c8e02ea28f83b68a787 100644
--- a/Processes/Pythia/Decay.h
+++ b/Processes/Pythia/Decay.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Pythia/Interaction.cc b/Processes/Pythia/Interaction.cc
index d7f04a0af203aae749b65ceec5872160759f55af..0b22b5b5e742e3b97ad88b53d70539a0bdeaa9bf 100644
--- a/Processes/Pythia/Interaction.cc
+++ b/Processes/Pythia/Interaction.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Pythia/Interaction.h b/Processes/Pythia/Interaction.h
index c75ff030ecf5b98e086e0545a3127e6e92ecf13d..117c2325185fc9d56c03319dc82bd0cc41d70542 100644
--- a/Processes/Pythia/Interaction.h
+++ b/Processes/Pythia/Interaction.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Pythia/Random.cc b/Processes/Pythia/Random.cc
index 0d08403ca1d890a062e2632124079c6a3cb220f6..acf2837a5ee7ee991a672ab28e21e8fbe16c87b2 100644
--- a/Processes/Pythia/Random.cc
+++ b/Processes/Pythia/Random.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Pythia/Random.h b/Processes/Pythia/Random.h
index 1ebf22c5f645f565c80e16510dadb08b36b8f6f7..c649e42bc4a0724677b8f23f353b93ebbfb05bd6 100644
--- a/Processes/Pythia/Random.h
+++ b/Processes/Pythia/Random.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Pythia/testPythia8.cc b/Processes/Pythia/testPythia8.cc
index daef1f9ef1648a65a184a0b075296bac3b7e16df..1a7ba3cc2b7910c40499e885a5c45120c383da84 100644
--- a/Processes/Pythia/testPythia8.cc
+++ b/Processes/Pythia/testPythia8.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/Interaction.cc b/Processes/QGSJetII/Interaction.cc
index f440f003433166d6e9e4a905ffb10e56d1cac922..b5afcb9a684e42c0c83a9e01c40c1f578079294d 100644
--- a/Processes/QGSJetII/Interaction.cc
+++ b/Processes/QGSJetII/Interaction.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/Interaction.h b/Processes/QGSJetII/Interaction.h
index 09ec576e8bf76c42da21ba35b05996a22d85d55f..aeed49ec78371dc8ddecf9728eeb013ae0dcb43d 100644
--- a/Processes/QGSJetII/Interaction.h
+++ b/Processes/QGSJetII/Interaction.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/ParticleConversion.cc b/Processes/QGSJetII/ParticleConversion.cc
index 266ebc5567671acc0616a7a84f83f2201ddbb15f..c8057e9ad7c7677aebf6e96f1e3e89e998f62ad1 100644
--- a/Processes/QGSJetII/ParticleConversion.cc
+++ b/Processes/QGSJetII/ParticleConversion.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/ParticleConversion.h b/Processes/QGSJetII/ParticleConversion.h
index 75c5e46a23a2402dc4e56adff56d583133b19974..9171706b331e6a388c486e038f6c982d94c2f71d 100644
--- a/Processes/QGSJetII/ParticleConversion.h
+++ b/Processes/QGSJetII/ParticleConversion.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/QGSJetIIFragmentsStack.h b/Processes/QGSJetII/QGSJetIIFragmentsStack.h
index 9d5c6a5984810d79ca6140bc97d576bf9883a854..9adb857134362b83b58d1ac9e45bd84193a92015 100644
--- a/Processes/QGSJetII/QGSJetIIFragmentsStack.h
+++ b/Processes/QGSJetII/QGSJetIIFragmentsStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/QGSJetIIStack.h b/Processes/QGSJetII/QGSJetIIStack.h
index 5d7b6d7c48fcdc585a0321d15d7dfcd11af8ab00..60ce7350edc758e5c06917855868a01868f93c58 100644
--- a/Processes/QGSJetII/QGSJetIIStack.h
+++ b/Processes/QGSJetII/QGSJetIIStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/qgsjet-II-04.cc b/Processes/QGSJetII/qgsjet-II-04.cc
index 89264a86a196e3d5f4600dc14f0f72c62682172c..fef484e999b46ea1ea8b196f4cc3a42492e987c3 100644
--- a/Processes/QGSJetII/qgsjet-II-04.cc
+++ b/Processes/QGSJetII/qgsjet-II-04.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/qgsjet-II-04.h b/Processes/QGSJetII/qgsjet-II-04.h
index 0f4910e598f583a2cccd3a9a99a26de5fa05f590..f9f75d826371873fc9985fb05478c48c81ab17dc 100644
--- a/Processes/QGSJetII/qgsjet-II-04.h
+++ b/Processes/QGSJetII/qgsjet-II-04.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/QGSJetII/testQGSJetII.cc b/Processes/QGSJetII/testQGSJetII.cc
index 707d6aea6d15cef8f2956cc5ced18ca0614c45c0..bc1a56ba8a6d56b88aca009d7a0bd547b76f74a3 100644
--- a/Processes/QGSJetII/testQGSJetII.cc
+++ b/Processes/QGSJetII/testQGSJetII.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/Decay.cc b/Processes/Sibyll/Decay.cc
index 7750bfd383febc8534b95b07ebffbb54bb263798..04113d40ba9c9fd545ece366bfc8a9d4f2989cb9 100644
--- a/Processes/Sibyll/Decay.cc
+++ b/Processes/Sibyll/Decay.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/Decay.h b/Processes/Sibyll/Decay.h
index ae05c7bcefb62c05451235178e80985eaa85ce22..de8a730d17a9c5fcef7ec8a72178fb55bbfb8e70 100644
--- a/Processes/Sibyll/Decay.h
+++ b/Processes/Sibyll/Decay.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/Interaction.cc b/Processes/Sibyll/Interaction.cc
index 7332a2b0da8839f0d9989b1f854d37f9c7532866..4894301e729825941a1120777eabafca845ca179 100644
--- a/Processes/Sibyll/Interaction.cc
+++ b/Processes/Sibyll/Interaction.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/Interaction.h b/Processes/Sibyll/Interaction.h
index 61e8c30ddfff99155a731216ff0b475d0a455074..80a1282185c100084b02766833a1cc7e9a83b52d 100644
--- a/Processes/Sibyll/Interaction.h
+++ b/Processes/Sibyll/Interaction.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/NuclearInteraction.cc b/Processes/Sibyll/NuclearInteraction.cc
index d557f28662be5ea754074d2ebf3f25828146ca6b..802cee9334e4a5f5303da3d7152d4149ac679072 100644
--- a/Processes/Sibyll/NuclearInteraction.cc
+++ b/Processes/Sibyll/NuclearInteraction.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/NuclearInteraction.h b/Processes/Sibyll/NuclearInteraction.h
index 42480b827e7ec2aca3ec2de9509b9f38094d5178..061545c76a7dfdd5b2ed1a25e74c2e98fc98cb41 100644
--- a/Processes/Sibyll/NuclearInteraction.h
+++ b/Processes/Sibyll/NuclearInteraction.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/ParticleConversion.cc b/Processes/Sibyll/ParticleConversion.cc
index 15a7c05b2bcfa3901ec988ed37ff4afca897fc6b..a6cf965cb4908a8ce129116626443975ab6e9275 100644
--- a/Processes/Sibyll/ParticleConversion.cc
+++ b/Processes/Sibyll/ParticleConversion.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/ParticleConversion.h b/Processes/Sibyll/ParticleConversion.h
index 7f11888e9231beb46ecbea1f5143b290be996119..143e15e63aac36287de7f05d918cae8f2c1065a4 100644
--- a/Processes/Sibyll/ParticleConversion.h
+++ b/Processes/Sibyll/ParticleConversion.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/SibStack.h b/Processes/Sibyll/SibStack.h
index 1a9d07b4d7a86791d4a68804fab7fc0057220aba..41cbce1e412ebde01858f2a54ff0af9d28b2ef2d 100644
--- a/Processes/Sibyll/SibStack.h
+++ b/Processes/Sibyll/SibStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/nuclib.h b/Processes/Sibyll/nuclib.h
index 874678c6346dfb9d293e3e78ab18f8eaf53639f9..6c8be53134e174c8e3079c6f7837dc8d4b8af20c 100644
--- a/Processes/Sibyll/nuclib.h
+++ b/Processes/Sibyll/nuclib.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/sibyll2.3d.cc b/Processes/Sibyll/sibyll2.3d.cc
index 87469d719f4705fd7407e830d1d1e250ebe070c9..7257e97a84340d7cc9dcf7c3dc7689c529762e3d 100644
--- a/Processes/Sibyll/sibyll2.3d.cc
+++ b/Processes/Sibyll/sibyll2.3d.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/sibyll2.3d.h b/Processes/Sibyll/sibyll2.3d.h
index fc5b1730cbe0c8fff1e3d33faf733931bf595511..9721e1747dc9fa7c6fa41cecb96a794d7aa7b479 100644
--- a/Processes/Sibyll/sibyll2.3d.h
+++ b/Processes/Sibyll/sibyll2.3d.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/Sibyll/testSibyll.cc b/Processes/Sibyll/testSibyll.cc
index a34405348a56910e52dd5b7f3f099642c7b5889c..7568f2b74b81912707e61e24563c6c209d774a22 100644
--- a/Processes/Sibyll/testSibyll.cc
+++ b/Processes/Sibyll/testSibyll.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2019 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/StackInspector/StackInspector.cc b/Processes/StackInspector/StackInspector.cc
index 720ccc96fbafa71c8c8865650f550ca3c085d9df..772196febdf3904d133e581bbb02dd359a8a803a 100644
--- a/Processes/StackInspector/StackInspector.cc
+++ b/Processes/StackInspector/StackInspector.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/StackInspector/StackInspector.h b/Processes/StackInspector/StackInspector.h
index ab18a81e86fba7dcab3dd0e04c563cdda625e3a3..de4a9912c9f5c2f050bbf5ad4fe48e0c39bfae8f 100644
--- a/Processes/StackInspector/StackInspector.h
+++ b/Processes/StackInspector/StackInspector.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/StackInspector/testStackInspector.cc b/Processes/StackInspector/testStackInspector.cc
index 1371f8bfaf48bd8a582cfca0abca152510b515d1..ed27628a6d9798c285831aed05bf328709bac8c5 100644
--- a/Processes/StackInspector/testStackInspector.cc
+++ b/Processes/StackInspector/testStackInspector.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/SwitchProcess/SwitchProcess.h b/Processes/SwitchProcess/SwitchProcess.h
index 26f32dd2c755e4a2cd0d7fcfd43bb9715a8177c7..e59e28da249f57610c09ecd48ffa1c9135e9974f 100644
--- a/Processes/SwitchProcess/SwitchProcess.h
+++ b/Processes/SwitchProcess/SwitchProcess.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/SwitchProcess/testSwitchProcess.cc b/Processes/SwitchProcess/testSwitchProcess.cc
index 510c731ff633331b8996326d3c940c68025b4796..0fee9b70cefdd4f3896b29886eed780248fe92b1 100644
--- a/Processes/SwitchProcess/testSwitchProcess.cc
+++ b/Processes/SwitchProcess/testSwitchProcess.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/TrackWriter/TrackWriter.cc b/Processes/TrackWriter/TrackWriter.cc
index 70e0c6bb6b1c44b1d95d02ee8aaa5802a554b112..530b4778c622f4877e4ddc9732e49b1f4963732c 100644
--- a/Processes/TrackWriter/TrackWriter.cc
+++ b/Processes/TrackWriter/TrackWriter.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/TrackWriter/TrackWriter.h b/Processes/TrackWriter/TrackWriter.h
index de79c90d407376becf35f0494478cb30fdf35afb..8387d4a9fc91fc41569999d1575cdabb59e95ed0 100644
--- a/Processes/TrackWriter/TrackWriter.h
+++ b/Processes/TrackWriter/TrackWriter.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/TrackingLine/TrackingLine.cc b/Processes/TrackingLine/TrackingLine.cc
index 09c05e2e863fd3f4b4e48331560f19a43dfbdeb8..ee76db62c7db07a0988a462367808530f6c636df 100644
--- a/Processes/TrackingLine/TrackingLine.cc
+++ b/Processes/TrackingLine/TrackingLine.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/TrackingLine/TrackingLine.h b/Processes/TrackingLine/TrackingLine.h
index 943bfa89c609468b3bd14d0b2899a0a2710c0dff..48bdc3a45da5d1fafcbc3ae144b7916ebd601797 100644
--- a/Processes/TrackingLine/TrackingLine.h
+++ b/Processes/TrackingLine/TrackingLine.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/TrackingLine/testTrackingLine.cc b/Processes/TrackingLine/testTrackingLine.cc
index 638e43bc7f83f8f45d1446b75dbfdb1d5092dee2..4cfa2bd603fb52bd6080a1167c80faf82d977b8c 100644
--- a/Processes/TrackingLine/testTrackingLine.cc
+++ b/Processes/TrackingLine/testTrackingLine.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/TrackingLine/testTrackingLineStack.h b/Processes/TrackingLine/testTrackingLineStack.h
index e6a3d7ee84d06ef5854f574529306a0dce93aa0f..1aeeecc10d0d17991a155c6fe55e062b50701fe5 100644
--- a/Processes/TrackingLine/testTrackingLineStack.h
+++ b/Processes/TrackingLine/testTrackingLineStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/UrQMD/UrQMD.cc b/Processes/UrQMD/UrQMD.cc
index ecc75e185ec36d08bc530d7bceb1481965514380..a9ee78c119ee00a9a6e3505bf2f612ba9e4ec293 100644
--- a/Processes/UrQMD/UrQMD.cc
+++ b/Processes/UrQMD/UrQMD.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/UrQMD/UrQMD.h b/Processes/UrQMD/UrQMD.h
index ac24beb6f0a6198da4664702905745ff14711165..6fb3d0234cd13a077f7d7ad95e49710091eb2128 100644
--- a/Processes/UrQMD/UrQMD.h
+++ b/Processes/UrQMD/UrQMD.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/UrQMD/testUrQMD.cc b/Processes/UrQMD/testUrQMD.cc
index 9127ef38167d520602fe44693002da80632529bd..5690e0c289cd941e2b45b2e5d1849b0e25b52448 100644
--- a/Processes/UrQMD/testUrQMD.cc
+++ b/Processes/UrQMD/testUrQMD.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Processes/UrQMD/urqmd_xs.cc b/Processes/UrQMD/urqmd_xs.cc
index 481cca267a8714079ffd9235794266441751c7a4..8fd9e225165ceb802cc5c5cd93e682f4cb8b6e82 100644
--- a/Processes/UrQMD/urqmd_xs.cc
+++ b/Processes/UrQMD/urqmd_xs.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/SCIENTIFIC_AUTHORS b/SCIENTIFIC_AUTHORS
index 823eb4b4eb6e1c23569f3797f08490fd7810ea4c..a00fe03acc791f21daa27da56ca89925febc7a9c 100644
--- a/SCIENTIFIC_AUTHORS
+++ b/SCIENTIFIC_AUTHORS
@@ -1,3 +1,28 @@
-See https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/wikis/ICRC2019
+This is currently derived from
+https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/wikis/ICRC2019
+and will be revised whenever needed:
 
+- Luisa Arrabito (1)
+- Dominik Baack (2)
+- Johan Bregeon (1)
+- Hans Dembinski (3)
+- Ralph Engel (4)
+- Dieter Heck (4)
+- Tim Huege (4,5)
+- Lukas Nellen (6)
+- Tanguy Pierog (4)
+- Maximilian Reininghaus (4,7)
+- Felix Riehn (8)
+- Ralf Ulrich (4)
+- Darko Veberic (4)
 
+Affiliations:
+
+- University of Montpellier, France
+- TU Dortmund University, Germany
+- Max Planck Institute for Nuclear Physics, Heidelberg, Germany
+- Karlsruhe Institute of Technology (KIT), Germany
+- Vrije Universiteit Brussel, Belgium
+- National Autonomous University of Mexico (UNAM)
+- Instituto de Tecnologías en Detección y Astropartículas (CNEA, CONICET, UNSAM), Buenos Aires, Argentina
+- Laboratory of Instrumentation and Experimental Particles (LIP), Portugal
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index 303184bb86c3d39768f6bc2d33b92a427d8d58a7..94b6ed91f0357fd82f6b217f63f1f6351fce1176 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Setup/SetupLogger.h b/Setup/SetupLogger.h
index 939c7d3596c4136257a4df27479943866b041ecb..27b3db663a7744c290c6b7c3ceb40c1cd6247c79 100644
--- a/Setup/SetupLogger.h
+++ b/Setup/SetupLogger.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index 16cdf64abae3750409500f6f08c708832dc2549e..30f60cd87303cd2a0ddf9e157064aaaab9f8fcd5 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Setup/SetupTrajectory.h b/Setup/SetupTrajectory.h
index f254aa3666d6a78f758169969cba1bd4be79a0ed..53fe4d04f7ed20210134d9ae8ecf2a76927a9b9b 100644
--- a/Setup/SetupTrajectory.h
+++ b/Setup/SetupTrajectory.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Stack/DummyStack/DummyStack.h b/Stack/DummyStack/DummyStack.h
index d4781e3ee054d032e4d82996e28985ec3e8b533a..b075916efcfdcf2fb38160b699c16b203670db0e 100644
--- a/Stack/DummyStack/DummyStack.h
+++ b/Stack/DummyStack/DummyStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Stack/NuclearStackExtension/NuclearStackExtension.h b/Stack/NuclearStackExtension/NuclearStackExtension.h
index 8898d15aafb8ce543a1778608bd003b30b5e8227..e1827f725c09b845ee062926fb70df7e1439e65c 100644
--- a/Stack/NuclearStackExtension/NuclearStackExtension.h
+++ b/Stack/NuclearStackExtension/NuclearStackExtension.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Stack/NuclearStackExtension/testNuclearStackExtension.cc b/Stack/NuclearStackExtension/testNuclearStackExtension.cc
index 7c37bfbf7606bbff86f34f4a4feb3b074313a491..a6ae932e7f7a428e51499e8403715b01233933df 100644
--- a/Stack/NuclearStackExtension/testNuclearStackExtension.cc
+++ b/Stack/NuclearStackExtension/testNuclearStackExtension.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Stack/SuperStupidStack/SuperStupidStack.h b/Stack/SuperStupidStack/SuperStupidStack.h
index e5d9ad0aef3cacf6e3790b94e656ad71a14f74dc..22cb88a6ceb2115e0e47bff38af127e29c8578a5 100644
--- a/Stack/SuperStupidStack/SuperStupidStack.h
+++ b/Stack/SuperStupidStack/SuperStupidStack.h
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/Stack/SuperStupidStack/testSuperStupidStack.cc b/Stack/SuperStupidStack/testSuperStupidStack.cc
index e16fb74bad84b92a6c8783dae0b54e366acd7dc0..04a892b50747d92c5e5e0d14e3da5eca984a0d75 100644
--- a/Stack/SuperStupidStack/testSuperStupidStack.cc
+++ b/Stack/SuperStupidStack/testSuperStupidStack.cc
@@ -1,8 +1,6 @@
 /*
  * (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
diff --git a/do-copyright.py b/do-copyright.py
index b7f2a3d06e6b5869e805a1bd0d05f1c5027ca724..a94ee4ddddd5a5e597b18a8afcee7c9e8c919316 100755
--- a/do-copyright.py
+++ b/do-copyright.py
@@ -10,8 +10,6 @@ import re
 text = """/*
  * (c) Copyright YEAR CORSIKA Project, corsika-project@lists.kit.edu
  *
- * See file AUTHORS for a list of contributors.
- *
  * This software is distributed under the terms of the GNU General Public
  * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
  * the license.
@@ -23,7 +21,7 @@ Debug settings are 0: nothing, 1: checking, 2: filesystem
 """
 Debug = 0 
 
-excludeDirs = ["ThirdParty", "git"]
+excludeDirs = ["ThirdParty", "git", "build", "install"]
 excludeFiles = ['PhysicalConstants.h','CorsikaFenvOSX.cc', 'sgn.h']
 
 extensions = [".cc", ".h", ".test"]
@@ -36,6 +34,10 @@ justCheck = True
 foundMissing: global variable set to True in case of any needed action 
 """
 foundMissing = False
+"""
+updateMessage: T: update message, put preserve the YEAR, F: no special action
+"""
+updateMessage = False
 
 """
 forYear: replace this with year for copyright notice via command line
@@ -45,7 +47,7 @@ forYear="YEAR"
 
 ###############################################
 #
-def checkNote(filename, justCheck, forYear):
+def checkNote(filename, justCheck, forYear, updateMessage):
     """
     function to check, if the file 'filename' contains an exact copy
     of the copyright notice defined above. 
@@ -56,6 +58,10 @@ def checkNote(filename, justCheck, forYear):
     the function will attempt to put the correct notice exactly once 
     at the top of the file. The copyright YEAR will be replace with 
     'forYear', e.g. forYear="2019" or forYear="2018-2020", etc.
+
+    If 'updateMessage' is True, then the value of Year will be determined 
+    from the previous copyright message, if possible. Thus, the copyright year
+    is preserved. 
     
     The global variable 'foundMissing' is set to True in the event 
     where any changes are identified, BUT not implemented. 
@@ -101,6 +107,7 @@ def checkNote(filename, justCheck, forYear):
     
     """ now check if first copyright notices is already identical... """
     isSame = False
+    prevYear = ""
     if len(startNote)>0: 
         isSame = True
         noteLines = text.split('\n')
@@ -108,12 +115,25 @@ def checkNote(filename, justCheck, forYear):
             if startNote[0]+iLine >= len(lines):
                 isSame = False
                 break
-            regex = re.compile(re.escape(noteLines[iLine].strip(" \n")).replace('YEAR','....'))
-            if not re.match(regex, lines[startNote[0]+iLine].strip(" \n")):
+
+            # only if updateMessage is True:
+            # read the YEAR from old message to use it for new message (->update message)
+            if updateMessage:
+                regexYear = re.compile(r'.*Copyright\s+(\d\d\S*)\s.*')
+                matchYear = re.match(regexYear, lines[startNote[0]+iLine].strip(" \n"))
+                if matchYear and len(matchYear.groups())>0:
+                    prevYear = str(matchYear.groups()[0])
+
+            # compare old with new message here:
+            regex = re.compile(re.escape(noteLines[iLine].strip(" \n")).replace('YEAR','(..+)'))
+            match = re.match(regex, lines[startNote[0]+iLine].strip(" \n"))
+            if not match:
+                if isSame:
+                    print ("needs update: " + filename + "\n   [diff] new=\'" + noteLines[iLine] +
+                           "\' vs old=\'" + lines[startNote[0]+iLine].rstrip('\n') + "\'")
                 isSame = False
                 foundMissing = True
-                print ("needs update: " + filename + " new=\'" + noteLines[iLine] + "\' vs old=\'" + lines[startNote[0]+iLine].rstrip('\n') + "\'")
-                break
+
     if Debug>0:
         print ("isSame=" + str(isSame) + " " + str(len(startNote)))
     
@@ -130,12 +150,15 @@ def checkNote(filename, justCheck, forYear):
         return
     
     """ add (new) copyright notice here: """
-    print ("File: " + filename + ", make copy to " + filename+".bak")
+    print ("   [file] " + filename + " --> backup to " + filename+".bak")
     os.rename(filename, filename+".bak")
     
     with open(filename, "w") as file:
-        
-        textReplace = re.sub(r"Copyright YEAR ", "Copyright " + forYear + " ", text)
+
+        if len(prevYear)>0:
+            textReplace = re.sub(r"Copyright YEAR ", "Copyright " + prevYear + " ", text)
+        else:
+            textReplace = re.sub(r"Copyright YEAR ", "Copyright " + forYear + " ", text)
         file.write(textReplace)
         
         skip = False
@@ -163,7 +186,7 @@ def checkNote(filename, justCheck, forYear):
 
 ###############################################
 #
-def next_file(dir_name, files, justCheck, forYear):
+def next_file(dir_name, files, justCheck, forYear, updateMessage):
     """
     check files: loops over list of files,
     excludes if wished, process otherwise
@@ -188,7 +211,7 @@ def next_file(dir_name, files, justCheck, forYear):
         if excludeThisFile:
             continue
         if file_extension in extensions:
-            checkNote(os.path.join(dir_name, check), justCheck, forYear)
+            checkNote(os.path.join(dir_name, check), justCheck, forYear, updateMessage)
         else:
             if Debug>1:
                 print ("exclude-extension: " + os.path.join(dir_name, check))
@@ -200,20 +223,26 @@ def main(argv):
    """
     the main program
    """
-   global justCheck, foundMissing, Debug, forYear
+   global justCheck, foundMissing, updateMessage, Debug, forYear
    justCheck = True
+   updateMessage = False
    Debug = 0
    try:
-      opts, args = getopt.getopt(argv, "cAhd:", ["check", "add=", "debug="])
+      opts, args = getopt.getopt(argv, "cnuA:hd:", ["check", "no-check", "update-message", "add=", "help", "debug="])
    except getopt.GetoptError:
-      print ('do-copyright.py [--check] [--add=YEAR] [--debug=0]')
+      print ('do-copyright.py [--check/--no-check] [--add=YEAR] [--update-message] [--debug=0]')
       sys.exit(2)
    for opt, arg in opts:
-      if opt == '-h':
-         print ('do-copyright.py [--check] [--add=YEAR] [--debug=0]')
-         sys.exit()
+      if opt in ("-h", "--help"):
+         print ('do-copyright.py [--check/--no-check] [--add=YEAR] [--update-message] [--debug=0]')
+         sys.exit() 
       elif opt in ("-c", "--check"):
          justCheck = True
+      elif opt in ("-n", "--no-check"):
+         justCheck = False         
+      elif opt in ("-u", "--update-message"):
+         updateMessage = True
+         print ('Preserve YEAR of existing message, where possible.')
       elif opt in ("-A", "--add"):
          justCheck = False
          forYear = str(arg)
@@ -223,9 +252,11 @@ def main(argv):
 
    if justCheck:
        print ('Only checking. No changes. See \'do-copyright.py -h\' for options.')
-         
+   else:
+       print ('** WARN: THIS WILL MODIFY YOUR FILES! ** ')
+       
    for root, dirs, files in os.walk('./'):
-       next_file(root, files, justCheck, forYear)
+       next_file(root, files, justCheck, forYear, updateMessage)
 
     
 ###############################################