diff --git a/src/main/java/com/release11/klaus/controller/MvcExceptionHandler.java b/src/main/java/com/release11/klaus/controller/MvcExceptionHandler.java
index 661b48c..8990e89 100644
--- a/src/main/java/com/release11/klaus/controller/MvcExceptionHandler.java
+++ b/src/main/java/com/release11/klaus/controller/MvcExceptionHandler.java
@@ -10,7 +10,6 @@ import javax.validation.ConstraintViolationException;
 import java.util.ArrayList;
 import java.util.List;
 
-//TODO: Is it really necessary?
 
 /**
  * Custom exception handler for {@link ConstraintViolationException}
diff --git a/src/main/java/com/release11/klaus/model/constraints/HttpCodeValidation.java b/src/main/java/com/release11/klaus/model/constraints/HttpCodeValidation.java
index 438e0a9..9de2675 100644
--- a/src/main/java/com/release11/klaus/model/constraints/HttpCodeValidation.java
+++ b/src/main/java/com/release11/klaus/model/constraints/HttpCodeValidation.java
@@ -17,7 +17,6 @@ import java.util.stream.Stream;
 public class HttpCodeValidation implements ConstraintValidator<HttpCode, Integer> {
     private Set<Integer> allowedValues;
 
-    //TODO: Find use of targetEnum
     /**
      * Initializes {@link #allowedValues} with possible http status values.
      * @param targetEnum HttpCode context
@@ -29,7 +28,6 @@ public class HttpCodeValidation implements ConstraintValidator<HttpCode, Integer
                 .collect(Collectors.toSet());
     }
 
-    //TODO: Find use of ConstraintValidatorContext
     /**
      * @param integer value of {@link MockedMessageDto#getHttpStatus()} or {@link MockedMessage#getHttpStatus()}
      * @param context context for validation
diff --git a/src/main/java/com/release11/klaus/repository/MockedResponseRepository.java b/src/main/java/com/release11/klaus/repository/MockedResponseRepository.java
index 570c120..ffcdded 100644
--- a/src/main/java/com/release11/klaus/repository/MockedResponseRepository.java
+++ b/src/main/java/com/release11/klaus/repository/MockedResponseRepository.java
@@ -21,6 +21,4 @@ public interface MockedResponseRepository extends CrudRepository<MockedMessage,
      * @return list of {@link com.release11.klaus.model.MockedMessage}
      */
     List<MockedMessage> findAllByClientUUID(UUID clientUUID);
-//    TODO: Remove if no use
-    MockedMessage getByCompositePrimaryKey(String compositePrimaryKey);
 }
diff --git a/target/classes/com/release11/klaus/controller/MvcExceptionHandler.class b/target/classes/com/release11/klaus/controller/MvcExceptionHandler.class
index ffec967..b357181 100644
Binary files a/target/classes/com/release11/klaus/controller/MvcExceptionHandler.class and b/target/classes/com/release11/klaus/controller/MvcExceptionHandler.class differ
diff --git a/target/classes/com/release11/klaus/model/constraints/HttpCodeValidation.class b/target/classes/com/release11/klaus/model/constraints/HttpCodeValidation.class
index 629bf0e..6352733 100644
Binary files a/target/classes/com/release11/klaus/model/constraints/HttpCodeValidation.class and b/target/classes/com/release11/klaus/model/constraints/HttpCodeValidation.class differ
diff --git a/target/classes/com/release11/klaus/repository/MockedResponseRepository.class b/target/classes/com/release11/klaus/repository/MockedResponseRepository.class
index eca139f..2f1a9f9 100644
Binary files a/target/classes/com/release11/klaus/repository/MockedResponseRepository.class and b/target/classes/com/release11/klaus/repository/MockedResponseRepository.class differ