diff --git a/phase4-lib/pom.xml b/phase4-lib/pom.xml
index 67346a8ad..fa0a3de93 100644
--- a/phase4-lib/pom.xml
+++ b/phase4-lib/pom.xml
@@ -295,6 +295,13 @@ osgi.serviceloader; osgi.serviceloader=com.helger.xml.microdom.convert.IMicroTyp
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <doclint>none</doclint>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/phase4-lib/src/main/java/com/helger/phase4/crypto/AS4TrustStoreDescriptor.java b/phase4-lib/src/main/java/com/helger/phase4/crypto/AS4TrustStoreDescriptor.java
index e39f42a1a..6236eca4e 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/crypto/AS4TrustStoreDescriptor.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/crypto/AS4TrustStoreDescriptor.java
@@ -50,7 +50,6 @@ private AS4TrustStoreDescriptor ()
    * <li><code>truststore.type</code> - the trust store type</li>
    * <li><code>truststore.file</code> - the trust store path</li>
    * <li><code>truststore.password</code> - the trust store password</li>
-   * password</li>
    * </ul>
    *
    * @return A new {@link TrustStoreDescriptor} object or <code>null</code> if
@@ -70,7 +69,6 @@ public static TrustStoreDescriptor createFromConfig ()
    * <li><code>truststore.type</code> - the trust store type</li>
    * <li><code>truststore.file</code> - the trust store path</li>
    * <li><code>truststore.password</code> - the trust store password</li>
-   * password</li>
    * </ul>
    *
    * @param aConfig
diff --git a/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilderMIMEPayload.java b/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilderMIMEPayload.java
index e45d4e26c..40d4ea44a 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilderMIMEPayload.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/sender/AbstractAS4UserMessageBuilderMIMEPayload.java
@@ -64,7 +64,7 @@ protected AbstractAS4UserMessageBuilderMIMEPayload ()
   {}
 
   /**
-   * <<<<<<< HEAD
+   * Get the payload to be send out.
    *
    * @return The currently set outgoing attachment payload. May be
    *         <code>null</code>.
diff --git a/pom.xml b/pom.xml
index 294efbef3..d5804ca73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,7 +338,7 @@
     <module>phase4-peppol-servlet</module>
     <module>phase4-peppol-server-webapp</module>
   </modules>
-
+<!--
   <build>
     <plugins>
       <plugin>
@@ -351,4 +351,5 @@
       </plugin>
     </plugins>
   </build>
+-->
 </project>