diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/model/events/SecurityEventToken.java b/api/src/main/java/de/fitko/fitconnect/api/domain/model/events/SecurityEventToken.java
deleted file mode 100644
index 177de51519ad7a4e2416344226433039a6fafab1..0000000000000000000000000000000000000000
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/model/events/SecurityEventToken.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.fitko.fitconnect.api.domain.model.events;
-
-public class SecurityEventToken {
-}
diff --git a/api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java b/api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java
index c9f74030f8932f433b4b40c416da9c1df68e76aa..9c52d861485b04bf31e73c9ffb9fca61f4455b7d 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/domain/validation/ValidationResult.java
@@ -1,7 +1,7 @@
 package de.fitko.fitconnect.api.domain.validation;
 
 /**
- * Wrapper for validations including errors that occurred
+ * Wrapper for validations including an exception
  */
 public class ValidationResult {
 
@@ -12,7 +12,7 @@ public class ValidationResult {
         this.isValid = isValid;
     }
 
-    private ValidationResult(final boolean isValid, Exception exception) {
+    private ValidationResult(final boolean isValid, final Exception exception) {
         this.isValid = isValid;
         this.error = exception;
     }
@@ -21,7 +21,7 @@ public class ValidationResult {
         return new ValidationResult(true);
     }
 
-    public static ValidationResult error(Exception exception) {
+    public static ValidationResult error(final Exception exception) {
         return new ValidationResult(false, exception);
     }
 
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java b/api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java
index d81eb60d18cc4b4ba608237683e5bcaa8069fa2f..560737265afc09302ab155f1746544604ca45ecc 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/exceptions/AuthenticationException.java
@@ -1,8 +1,5 @@
 package de.fitko.fitconnect.api.exceptions;
 
-/**
- * An error that occurred during the OAuth authentication
- */
 public class AuthenticationException extends RuntimeException {
 
     public AuthenticationException(final String errorMessage, final Throwable error) {
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java b/api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java
index dba418f8a64867f58007393b6c73db39cc7ec994..dcaadebe61442569ecec9d827b6c71b1611e7a28 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/exceptions/DecryptionException.java
@@ -1,8 +1,5 @@
 package de.fitko.fitconnect.api.exceptions;
 
-/**
- * An error that occurred decrypting data or attachments
- */
 public class DecryptionException extends RuntimeException {
 
     public DecryptionException(final String errorMessage) {
diff --git a/api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java b/api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java
index 985d10ecc54e83bbea8282111376a9f577d64607..664a3ba0a0b95cb90b53d5a60ea1ba50b00be512 100644
--- a/api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java
+++ b/api/src/main/java/de/fitko/fitconnect/api/exceptions/EncryptionException.java
@@ -1,8 +1,5 @@
 package de.fitko.fitconnect.api.exceptions;
 
-/**
- * An error that occurred whilst encrypting data or attachments
- */
 public class EncryptionException extends RuntimeException {
 
     public EncryptionException(final String errorMessage) {