diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java
index 13ab9471..6d50db3b 100644
--- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java
+++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/api/objects/replykeyboard/ApiResponse.java
@@ -11,8 +11,7 @@ import java.io.Serializable;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 06 of November of 2016
+ * Response from Telegram Server
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java
index 2fe07228..912d2857 100644
--- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java
+++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotOptions.java
@@ -3,8 +3,7 @@ package org.telegram.telegrambots.generics;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
+ * Bot options
  */
 public interface BotOptions {
     String getBaseUrl();
diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java
index bff5af03..b3cb8400 100644
--- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java
+++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/BotSession.java
@@ -3,8 +3,7 @@ package org.telegram.telegrambots.generics;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
+ * Bot session interface
  */
 public interface BotSession {
     void setOptions(BotOptions options);
diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java
index 05da1e38..c5c04e3c 100644
--- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java
+++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesHandler.java
@@ -3,8 +3,7 @@ package org.telegram.telegrambots.generics;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
+ * Base Updates Handler interface
  */
 public interface UpdatesHandler {
 }
diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java
index 36f90329..540bcb91 100644
--- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java
+++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/UpdatesReader.java
@@ -3,8 +3,7 @@ package org.telegram.telegrambots.generics;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
+ * Updates reader interface
  */
 public interface UpdatesReader {
     void start();
diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java
index 004b6f11..0e6b9d9d 100644
--- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java
+++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/generics/Webhook.java
@@ -5,8 +5,7 @@ import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
+ * Webhook interface
  */
 public interface Webhook {
     void startServer() throws TelegramApiRequestException;
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java
index 772539a7..b071515a 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TelegramBotsHelper.java
@@ -3,8 +3,6 @@ package org.telegram.telegrambots.test;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 04 of November of 2016
  */
 public final class TelegramBotsHelper {
     private TelegramBotsHelper() {
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java
index 77b125c2..37c92ea9 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestDeserialization.java
@@ -27,8 +27,6 @@ import java.util.List;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 04 of November of 2016
  */
 public class TestDeserialization {
     private ObjectMapper mapper;
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java
index 444cb91c..7e446351 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/TestTelegramApi.java
@@ -9,8 +9,6 @@ import org.telegram.telegrambots.exceptions.TelegramApiRequestException;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
  */
 public class TestTelegramApi extends TestBase {
 
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java
index ba98633e..8fffcaf6 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/asserts/ApiAssert.java
@@ -3,8 +3,6 @@ package org.telegram.telegrambots.test.asserts;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 04 of November of 2016
  */
 public final class ApiAssert {
     private ApiAssert() {}
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java
index 1b68147b..b6867945 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/base/TestBase.java
@@ -10,8 +10,6 @@ import org.telegram.telegrambots.generics.Webhook;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
  */
 public abstract class TestBase {
 
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java
index ec75847a..dc0b9e52 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeBotSession.java
@@ -7,8 +7,6 @@ import org.telegram.telegrambots.generics.LongPollingBot;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
  */
 public class FakeBotSession implements BotSession {
     @Override
diff --git a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java
index a1d279ac..d38ebdbe 100644
--- a/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java
+++ b/telegrambots-meta/src/test/java/org/telegram/telegrambots/test/fakes/FakeWebhook.java
@@ -7,8 +7,6 @@ import org.telegram.telegrambots.generics.WebhookBot;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
  */
 public class FakeWebhook implements Webhook {
     private String internalUrl;
diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java b/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java
index 8de501b2..e6126c8b 100644
--- a/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java
+++ b/telegrambots/src/main/java/org/telegram/telegrambots/ApiContextInitializer.java
@@ -8,8 +8,7 @@ import org.telegram.telegrambots.updatesreceivers.DefaultWebhook;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 29 of October of 2016
+ * Initialization of ApiContext
  */
 public final class ApiContextInitializer {
     private ApiContextInitializer() {
diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java
index 3716ad92..9b8be88d 100644
--- a/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java
+++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/BotApiMethodHelperFactory.java
@@ -43,8 +43,6 @@ import java.util.List;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 02 of November of 2016
  */
 public final class BotApiMethodHelperFactory {
     private BotApiMethodHelperFactory() {
diff --git a/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java b/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java
index d0b13f34..0cf6f510 100644
--- a/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java
+++ b/telegrambots/src/test/java/org/telegram/telegrambots/test/TestRestApi.java
@@ -31,8 +31,6 @@ import static org.junit.Assert.fail;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
- * @date 01 of November of 2016
  */
 public class TestRestApi extends JerseyTest {