diff --git a/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java b/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java
index 537606a00..b9d488e18 100644
--- a/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java
+++ b/WoPeD-Configuration/src/main/java/org/woped/config/WoPeDConfiguration.java
@@ -122,8 +122,6 @@ public String getAppdir() {
   public abstract boolean readConfig(InputStream is);
 
   /**
-   * TODO: DOCUMENTATION (silenco)
-   *
    * @param file
    * @param configType type indicator for type of currently handled configuration
    * @return
@@ -131,8 +129,6 @@ public String getAppdir() {
   public abstract boolean readConfig(File file);
 
   /**
-   * TODO: DOCUMENTATION (silenco)
-   *
    * @param confDoc
    * @return
    */
diff --git a/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java b/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java
index 4481fffa1..be4155f94 100644
--- a/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java
+++ b/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDGeneralConfiguration.java
@@ -91,8 +91,6 @@ public boolean initConfig() {
   }
 
   /**
-   * TODO: DOCUMENTATION (silenco)
-   *
    * @return indicates whether loading was successful
    */
   public boolean readConfig() {
@@ -160,8 +158,6 @@ public boolean readConfig(InputStream is) {
   }
 
   /**
-   * TODO: DOCUMENTATION (silenco)
-   *
    * @param file
    * @return
    */
@@ -188,8 +184,6 @@ public boolean readConfig(File file) {
   }
 
   /**
-   * TODO: DOCUMENTATION (silenco)
-   *
    * @param configDoc
    * @return
    */
@@ -285,8 +279,6 @@ public boolean readConfig(XmlObject configDoc) {
   }
 
   /**
-   * TODO: DOCUMENTATION (silenco)
-   *
    * @param file
    * @return
    */
diff --git a/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java b/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java
index 12312d049..000382dc5 100644
--- a/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java
+++ b/WoPeD-Starter/src/main/java/org/woped/starter/utilities/WopedLogger.java
@@ -1,8 +1,6 @@
 /*
  * Created on 28.10.2005
  *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.woped.starter.utilities;
 
@@ -11,8 +9,6 @@
 
 /**
  * @author lai
- *     <p>TODO To change the template for this generated type comment go to Window - Preferences -
- *     Java - Code Style - Code Templates
  */
 public class WopedLogger implements ILogger {