diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp
index a88979b3479..6f4a8260e97 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp
@@ -6,10 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2018-03-13
-/// @author Moritz Kiehn <msmk@cern.ch>
-
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp
index c09c3803a54..0b046e77408 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp
@@ -6,10 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2018-03-13
-/// @author Moritz Kiehn <msmk@cern.ch>
-
 #pragma once
 
 #include "ActsExamples/Framework/RandomNumbers.hpp"
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp
index 6735b372010..712fbc9aacc 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp
@@ -6,10 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2018-03-13
-/// @author Moritz Kiehn <msmk@cern.ch>
-
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
index d6c9fba3bc9..86389fd8cfc 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
@@ -6,10 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2018-03-14
-/// @author Moritz Kiehn <msmk@cern.ch>
-
 #pragma once
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
diff --git a/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp b/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp
index 73992c579e7..29b6d894bae 100644
--- a/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp
@@ -6,12 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2016-05-11 Initial version
-/// @date 2017-07-27 Simplify interface
-/// @author Andreas Salzburger
-/// @author Moritz Kiehn <msmk@cern.ch>
-
 #pragma once
 
 #include "ActsExamples/Framework/ProcessCode.hpp"
diff --git a/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp b/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp
index b111ad56004..49a096da2e1 100644
--- a/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp
@@ -6,10 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2017-07-25
-/// @author Moritz Kiehnn <msmk@cern.ch>
-
 #pragma once
 
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
diff --git a/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp b/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp
index a07fcf68f6c..84b3bcbf571 100644
--- a/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp
@@ -6,10 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @date 2017-08-07
-/// @author Moritz Kiehnn <msmk@cern.ch>
-
 #pragma once
 
 #include "ActsExamples/Framework/DataHandle.hpp"
diff --git a/Examples/HelloWorld/HelloWorld.cpp b/Examples/HelloWorld/HelloWorld.cpp
index 535ad4d6e3c..85b494d1273 100644
--- a/Examples/HelloWorld/HelloWorld.cpp
+++ b/Examples/HelloWorld/HelloWorld.cpp
@@ -6,9 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @brief An example tools that shows the sequencer functionality
-
 #include "ActsExamples/Framework/RandomNumbers.hpp"
 #include "ActsExamples/Framework/Sequencer.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvOutputData.hpp b/Examples/Io/Csv/src/CsvOutputData.hpp
index c06ba7144da..c3b7c3deafe 100644
--- a/Examples/Io/Csv/src/CsvOutputData.hpp
+++ b/Examples/Io/Csv/src/CsvOutputData.hpp
@@ -6,9 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @brief Plain structs that each define one row in a TrackML csv file
-
 #pragma once
 
 #include <ActsExamples/EventData/Index.hpp>
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp
index 4ddf0a7e66d..b3a50971eae 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp
@@ -6,9 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file
-/// @brief Predefined materials for test
-
 #pragma once
 
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
index 01f034369c0..4548cb94933 100644
--- a/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file ConstantBField_tests.cpp
-
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
index 4a6ad3df443..2abb6c72d8f 100644
--- a/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file InterpolatedBFieldMap_tests.cpp
-
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp b/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
index 67e517d12a9..06debb0ebeb 100644
--- a/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file MagneticFieldInterfaceConsistencyTests.cpp
-
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
index d66b8097060..2325ed6b6a4 100644
--- a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file SolenoidBFieldTests.cpp
-
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp b/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
index 912d76f9957..79a5c94cd81 100644
--- a/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
+++ b/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file InterpolatedMaterialdMapTests.cpp
-
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/LoggerTests.cpp b/Tests/UnitTests/Core/Utilities/LoggerTests.cpp
index e6451b547cf..b8e11273df7 100644
--- a/Tests/UnitTests/Core/Utilities/LoggerTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/LoggerTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-/// @file Logger_tests.cpp
-
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/Logger.hpp"