diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunnerProvider.java b/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunnerProvider.java
index 6d647477b6..b7b8646357 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunnerProvider.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunnerProvider.java
@@ -21,7 +21,6 @@
 /**
  *  Interface for providing TestCaseRunner.
  *
- *  @author Thorsten Schlathoelter
  *  @since 4.0
  */
 public interface TestCaseRunnerProvider {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java
index 0783e558aa..ce32fe3c06 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java
@@ -20,8 +20,6 @@
 
 /**
  * Class extracting values of segments of VariableExpressions.
- *
- * @author Thorsten Schlathoelter
  */
 public interface SegmentVariableExtractor {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java
index 095bee5e4c..0f4b6c22c8 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java
@@ -37,8 +37,6 @@
  * the extractors managed by this registry in order to access variable content from the TestContext expressed by variable expressions.
  * <p>
  * Registry provides all known {@link SegmentVariableExtractor}s.
- *
- * @author Thorsten Schlathoelter
  */
 public class SegmentVariableExtractorRegistry {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java
index a955c1a6c3..01dc2b02bd 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java
@@ -39,8 +39,6 @@
  *   <li>the third element of the <b>persons</b> property of the variable retrieved in the previous step</li>
  *   <li>the first element of the <b>firstnames</b> property of the property retrieved in the previous step</li>
  * </ol>
- *
- * @author Thorsten Schlathoelter
  */
 public class VariableExpressionIterator implements Iterator<VariableSegment> {
 
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java
index cd14f16866..d1abb46082 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.spi.mocks;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class FooWithParams {
 
     public FooWithParams(int intParam, short shortParam,  double doubleParam, float floatParam,
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java
index 451ea40325..b20b7c6acc 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.spi.mocks;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class SingletonFoo {
 
     public static final SingletonFoo INSTANCE = new SingletonFoo();
diff --git a/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java b/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java
index 85e2c7fcb9..ed03364c69 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java
@@ -35,7 +35,6 @@
  * The specified file must define the type of {@link TestCaseRunnerProvider} responsible for
  * delivering the custom test case runner.
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  * @see TestCaseRunnerProvider
  */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java
index 1dc80fab73..e40464d6f1 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java
@@ -26,7 +26,6 @@
  * loading SpringXmlTest.
  *
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  * @see SpringXmlTestLoader
  */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java
index 1a3d5e6234..cc3762824a 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java
@@ -27,7 +27,6 @@
  * This configuration is necessary only when using Spring without Spring Boot. Spring Boot includes a standard conversion service
  * that automatically detects and uses relevant converters by default.
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  */
 @Configuration
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java b/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java
index 060c108c86..cfaa6a7c7f 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java
@@ -26,7 +26,7 @@
  * Namespace handler registers bean definition parser
  * for Citrus testcase schema elements.
  *
- * @author Christoph Deppisch, Thorsten Schlathoelter
+ * @author Christoph Deppisch
  * @since 2007
  */
 public class CitrusTestCaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java
index b56eb3dc79..8652bb0a6b 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java
@@ -35,7 +35,6 @@
  *
  * @param <T>
  *
- * @author Thorsten Schlathoelter
  */
 public abstract class BaseTestCaseMetaInfoParser<T extends TestCaseMetaInfo> implements BeanDefinitionParser  {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java
index 93d7bec510..60711635e9 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseParser.java
@@ -39,7 +39,7 @@
  *
  *  @param <T>
  *
- *  @author Christop Deppisch, Thorsten Schlathoelter
+ *  @author Christop Deppisch
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class BaseTestCaseParser<T extends TestCase> implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java b/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
index 44f8c04203..baf7da0a26 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
@@ -33,7 +33,6 @@
  * Delegates to a {@link Resources} to do the {@link Resource} creation. The implementation follows the
  * implementation of {@link org.springframework.core.io.ResourceEditor}.
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  */
 public class CitrusResourceEditor extends PropertyEditorSupport {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
index 2a2fa2caa4..f2afae6854 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
@@ -31,9 +31,6 @@
 
 import java.io.*;
 
-/**
- * @author Thorsten Schlatoelter
- */
 public class CustomTestCaseParserTest extends AbstractActionParserTest<EchoAction> {
 
     @BeforeClass
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
index a2f5768fcd..21ad578743 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
@@ -32,9 +32,6 @@
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
-/**
- * @author Thorsten Schlathoelter
- */
 @SpringXmlTestLoaderConfiguration(
         parserConfigurations = {
                 @BeanDefinitionParserConfiguration(name = "testcase", parser = SpringXmlTestLoaderIT.CustomTestCaseParser.class),
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java
index 9d3614d201..2c4934d156 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Thorsten Schlathoelter
  * @since 3.1.3
  */
 public class SendSoapMessageWithSchemaValidationIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java
index ec6f829907..f86c179fb2 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java
@@ -32,9 +32,6 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-/**
- * @author Thorsten Schlathoelter
- */
 @SpringXmlTestLoaderConfiguration(
         parserConfigurations = {
                 @BeanDefinitionParserConfiguration(name = "testcase", parser = SpringXmlTestLoaderIT.CustomTestCaseParser.class),
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java
index 9567b9a83f..1058b107bb 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java
@@ -39,9 +39,6 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-/**
- * @author Thorsten Schlathoelter
- */
 @CitrusSpringSupport
 @ContextConfiguration(classes = {CitrusSpringConfig.class, CustomConfiguration.class})
 @SpringXmlTestLoaderConfiguration(
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java
index 79278dd0ea..2234f9ea93 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java
@@ -18,9 +18,6 @@
 
 import org.testng.SkipException;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class TestNGUtils {
 
     /**
diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java b/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java
index 7aa18331b5..b86f40dbe3 100644
--- a/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java
+++ b/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java
@@ -17,9 +17,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class JavaCitrusCodegen extends AbstractJavaCodegen {
 
     private static final Logger logger = LoggerFactory.getLogger(JavaCitrusCodegen.class);
diff --git a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/CodeGenMojoWrapper.java b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/CodeGenMojoWrapper.java
index ea92db1efb..dddd8da625 100644
--- a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/CodeGenMojoWrapper.java
+++ b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/CodeGenMojoWrapper.java
@@ -14,8 +14,6 @@
 
 /**
  * Wrapper class that uses reflection to expose several properties of the {@link CodeGenMojo} for explicit assignment.
- *
- * @author Thorsten Schlathoelter
  */
 public class CodeGenMojoWrapper extends CodeGenMojo {
 
diff --git a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/SpringMetaFileGenerator.java b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/SpringMetaFileGenerator.java
index 23ae7b161f..b793b62346 100644
--- a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/SpringMetaFileGenerator.java
+++ b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/SpringMetaFileGenerator.java
@@ -26,8 +26,6 @@
  * {@link TestApiGeneratorMojo#CITRUS_TEST_SCHEMA}.
  * </p>
  *
- * @author Thorsten Schlathoelter
- *
  */
 public class SpringMetaFileGenerator {
 
diff --git a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java
index d5b2b1cd53..fce0a54755 100644
--- a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java
+++ b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java
@@ -36,8 +36,6 @@
  *   of creating robust integration tests.
  * </p>
  *
- * @author Thorsten Schlathoelter
- *
  */
 @Mojo(
     name = "create-test-api",
diff --git a/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoIntegrationTest.java b/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoIntegrationTest.java
index d4bcc740b9..4cccffe386 100644
--- a/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoIntegrationTest.java
+++ b/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoIntegrationTest.java
@@ -38,9 +38,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- * @author Thorsten Schlathoelter
- */
 class TestApiGeneratorMojoIntegrationTest extends AbstractMojoTestCase {
 
     public static final String OTHER_META_FILE_CONTENT = "somenamespace=somevalue";
diff --git a/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoUnitTest.java b/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoUnitTest.java
index c63753525f..1bb8781631 100644
--- a/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoUnitTest.java
+++ b/test-api-generator/citrus-test-api-generator-maven-plugin/src/test/java/org/citrusframework/maven/plugin/TestApiGeneratorMojoUnitTest.java
@@ -42,9 +42,6 @@
 import org.openapitools.codegen.plugin.CodeGenMojo;
 
 
-/**
- * @author Thorsten Schlathoelter
- */
 @ExtendWith(MockitoExtension.class)
 @SuppressWarnings({"JUnitMalformedDeclaration", "JUnitMixedFramework"})
 class TestApiGeneratorMojoUnitTest extends AbstractMojoTestCase {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java
index d314480ca5..5111007448 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java
@@ -24,9 +24,6 @@
 import org.citrusframework.variable.SegmentVariableExtractorRegistry;
 import org.citrusframework.variable.VariableExpressionSegmentMatcher;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class JsonPathSegmentVariableExtractor extends SegmentVariableExtractorRegistry.AbstractSegmentVariableExtractor {
 
     @Override
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java
index 0e0ee46a6b..f4c89365d5 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java
@@ -34,9 +34,6 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class XpathSegmentVariableExtractor extends SegmentVariableExtractorRegistry.AbstractSegmentVariableExtractor {
 
     /**