diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java
index 794d173..6c0ecd3 100644
--- a/src/main/java/com/release11/klaus/controller/MockController.java
+++ b/src/main/java/com/release11/klaus/controller/MockController.java
@@ -34,7 +34,7 @@ public class MockController {
      * @return confirmation and 200 OK
      */
     @SneakyThrows
-    @PutMapping("/")
+    @PutMapping
     public ResponseEntity<String> updateMessage(@RequestBody String body){
         ObjectMapper mapper = new ObjectMapper();
         MockedMessageDto message = mapper.readValue(body, MockedMessageDto.class);
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/MockedMessageDto.java b/src/main/java/com/release11/klaus/model/MockedMessageDto.java
index 7c462ff..21b5e6d 100644
--- a/src/main/java/com/release11/klaus/model/MockedMessageDto.java
+++ b/src/main/java/com/release11/klaus/model/MockedMessageDto.java
@@ -30,15 +30,6 @@ public class MockedMessageDto implements Serializable, Comparable<MockedMessageD
     @HttpCode
     private Integer httpStatus;
 
-//    TODO: Remove if no use
-    public MockedMessageDto(UUID clientUUID) {
-        this.clientUUID = clientUUID;
-    }
-    public MockedMessageDto(UUID clientUUID, Map<String,String> httpHeaders) {
-        this.clientUUID = clientUUID;
-        this.httpHeaders = httpHeaders;
-    }
-
     @Override
     public int compareTo(MockedMessageDto message) {
         return this.mockedResponseId > message.getMockedResponseId() ? 1 : -1;
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/EventRepositoryImpl.java b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
index 906aa4e..e8c0698 100644
--- a/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
+++ b/src/main/java/com/release11/klaus/repository/EventRepositoryImpl.java
@@ -63,12 +63,10 @@ public class EventRepositoryImpl implements EventRepository {
     private List<Event> parseEvents(List<String> eventStrings) {
         List<Event> events = new ArrayList<>();
         for (String eventString : eventStrings) {
+            eventString = eventString.replaceAll("\\R", "");
             try {
-                eventString = eventString.replaceAll("\\R", "");
                 events.add(objectMapper.readValue(eventString, Event.class));
-                JSONObject jsonObject = new JSONObject(eventString);
-
-            } catch (JsonProcessingException | JSONException e) {
+            } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }
         }
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/src/main/java/com/release11/klaus/service/KlausServiceImpl.java b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
index 48bee88..2326bcd 100644
--- a/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
+++ b/src/main/java/com/release11/klaus/service/KlausServiceImpl.java
@@ -19,7 +19,7 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
- * Service for {@link com.release11.klaus.controller.KlausController} and {@link com.release11.klaus.controller.MockController}
+ * Service for {@link com.release11.klaus.controller.MockController} and {@link com.release11.klaus.controller.MockController}
  * Allows for performing CRUD operations on {@link MockedMessageDto}
  * @author Rafał Żukowicz
  * @author Gabriel Modzelewski
@@ -59,7 +59,6 @@ public class KlausServiceImpl implements KlausService {
                 .collect(Collectors.toList());
     }
 
-//    TODO: check logic
     /**
      * Returns {@link MockedMessageDto} of given id and key-uuid. If message doesn't then empty message is returned
      * @param clientUUID the key-uuid of given set of messages
@@ -84,7 +83,6 @@ public class KlausServiceImpl implements KlausService {
         return mockedMessageDto;
     }
 
-//    TODO: Remove code of no use
     /**
      * Allows to modify mocked message. If message of given id and key-uuid doesn't exist a new entry is created
      * @param mockedMessageDto message to be saved
@@ -94,9 +92,6 @@ public class KlausServiceImpl implements KlausService {
     @Override
     public ResponseEntity<String> setMockedResponse(MockedMessageDto mockedMessageDto) {
         mockedResponseRepository.save(mockedMessageMapper.mockedMessageDtoToMockedMessage(mockedMessageDto));
-        String s = objectMapper.writeValueAsString(mockedMessageDto);
-        String s1 = mockedMessageDto.toString();
-        String s2 = String.valueOf(mockedMessageDto);
         log.info(mockedMessageDto.toString().replaceAll("\"", "\\\\\""));
         return new ResponseEntity<>("MockedResponse has been setup successfully!", new HttpHeaders(),
                 HttpStatus.ACCEPTED);
diff --git a/src/main/java/com/release11/klaus/utilis/ObjectConfig.java b/src/main/java/com/release11/klaus/utilis/ObjectConfig.java
deleted file mode 100644
index 895456a..0000000
--- a/src/main/java/com/release11/klaus/utilis/ObjectConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.release11.klaus.utilis;
-
-import com.release11.klaus.model.MockedMessageDto;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-//TODO: is it really necessary? kekw
-@Configuration
-public class ObjectConfig {
-    @Bean
-    public MockedMessageDto globalMessageDto(){
-        return new MockedMessageDto();
-    }
-}
diff --git a/src/main/java/com/release11/klaus/utilis/RedisAppender.java b/src/main/java/com/release11/klaus/utilis/RedisAppender.java
index a6dd5aa..081c2c6 100644
--- a/src/main/java/com/release11/klaus/utilis/RedisAppender.java
+++ b/src/main/java/com/release11/klaus/utilis/RedisAppender.java
@@ -15,7 +15,7 @@ import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.Protocol;
 
-//TODO: The check? Check if any of the following methods might be removed...
+//TODO: Add javadoc
 public class RedisAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
 
     JedisPool pool;
diff --git a/src/main/java/com/release11/klaus/utilis/TrackingClient.java b/src/main/java/com/release11/klaus/utilis/TrackingClient.java
index 27fddbf..9a626bd 100644
--- a/src/main/java/com/release11/klaus/utilis/TrackingClient.java
+++ b/src/main/java/com/release11/klaus/utilis/TrackingClient.java
@@ -4,7 +4,6 @@ import org.slf4j.MDC;
 
 import java.util.Map;
 
-//TODO: Check if constructor might be safely removed. It's static class tho
 /**
  * This static class has one purpose and one purpose only. It logs data about incomming requests.
  * The data from logs is received via {@link com.release11.klaus.repository.EventRepositoryImpl}
@@ -12,8 +11,6 @@ import java.util.Map;
  */
 public final class TrackingClient {
 
-    private TrackingClient(){}
-
     /**
      * Logs data inside the given map
      * @param businessKeysMap map containing all the information about incomming request
diff --git a/target/classes/com/release11/klaus/controller/MockController.class b/target/classes/com/release11/klaus/controller/MockController.class
index 0eb3c3e..9577f6c 100644
Binary files a/target/classes/com/release11/klaus/controller/MockController.class and b/target/classes/com/release11/klaus/controller/MockController.class differ
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/MockedMessageDto.class b/target/classes/com/release11/klaus/model/MockedMessageDto.class
index 4959b55..b403a6c 100644
Binary files a/target/classes/com/release11/klaus/model/MockedMessageDto.class and b/target/classes/com/release11/klaus/model/MockedMessageDto.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/EventRepositoryImpl.class b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class
index 9daf232..e4cf001 100644
Binary files a/target/classes/com/release11/klaus/repository/EventRepositoryImpl.class and b/target/classes/com/release11/klaus/repository/EventRepositoryImpl.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
diff --git a/target/classes/com/release11/klaus/service/KlausServiceImpl.class b/target/classes/com/release11/klaus/service/KlausServiceImpl.class
index 24347a7..6cac428 100644
Binary files a/target/classes/com/release11/klaus/service/KlausServiceImpl.class and b/target/classes/com/release11/klaus/service/KlausServiceImpl.class differ
diff --git a/target/classes/com/release11/klaus/utilis/ObjectConfig.class b/target/classes/com/release11/klaus/utilis/ObjectConfig.class
deleted file mode 100644
index 96bd064..0000000
Binary files a/target/classes/com/release11/klaus/utilis/ObjectConfig.class and /dev/null differ
diff --git a/target/classes/com/release11/klaus/utilis/TrackingClient.class b/target/classes/com/release11/klaus/utilis/TrackingClient.class
index 3945cde..ad3b41e 100644
Binary files a/target/classes/com/release11/klaus/utilis/TrackingClient.class and b/target/classes/com/release11/klaus/utilis/TrackingClient.class differ