diff --git a/mongo-connector/src/main/java/net/codingarea/challenges/mongoconnector/MongoConnector.java b/mongo-connector/src/main/java/net/codingarea/challenges/mongoconnector/MongoConnector.java
index 0ea5eb464..1277a6e1f 100644
--- a/mongo-connector/src/main/java/net/codingarea/challenges/mongoconnector/MongoConnector.java
+++ b/mongo-connector/src/main/java/net/codingarea/challenges/mongoconnector/MongoConnector.java
@@ -4,10 +4,7 @@
 import net.codingarea.challenges.plugin.Challenges;
 import org.bukkit.plugin.java.JavaPlugin;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
+
 public final class MongoConnector extends JavaPlugin {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/ChallengeAPI.java b/plugin/src/main/java/net/codingarea/challenges/plugin/ChallengeAPI.java
index fee43728e..309c8efa2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/ChallengeAPI.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/ChallengeAPI.java
@@ -16,10 +16,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ChallengeAPI {
 
 	private ChallengeAPI() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/Challenges.java b/plugin/src/main/java/net/codingarea/challenges/plugin/Challenges.java
index 3bc0e9c60..4b0da0fe4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/Challenges.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/Challenges.java
@@ -25,11 +25,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 @Getter
 public final class Challenges extends BukkitModule {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/CustomChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/CustomChallenge.java
index 3c1c775b6..e6035faf9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/CustomChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/CustomChallenge.java
@@ -24,10 +24,6 @@
 import java.util.Map.Entry;
 import java.util.UUID;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Getter
 @ToString
 public class CustomChallenge extends Setting {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeExecutionData.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeExecutionData.java
index f1a4a31fa..133327a32 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeExecutionData.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeExecutionData.java
@@ -15,10 +15,6 @@
 
 import java.util.*;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class ChallengeExecutionData {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeSetting.java
index f9a6d09b2..f0d9b2657 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/ChallengeSetting.java
@@ -4,10 +4,6 @@
 
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ChallengeSetting implements IChallengeSetting {
 
 	private final String name;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/CustomSettingsLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/CustomSettingsLoader.java
index 78b161bb8..d1db4e40f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/CustomSettingsLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/CustomSettingsLoader.java
@@ -15,10 +15,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class CustomSettingsLoader {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/FallbackNames.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/FallbackNames.java
index 31e878e7b..ab5798085 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/FallbackNames.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/FallbackNames.java
@@ -6,10 +6,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface FallbackNames {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/IChallengeSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/IChallengeSetting.java
index 03741e54e..1c91e30be 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/IChallengeSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/IChallengeSetting.java
@@ -3,10 +3,6 @@
 import net.codingarea.challenges.plugin.challenges.custom.settings.sub.SubSettingsBuilder;
 import org.bukkit.Material;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public interface IChallengeSetting {
 
 	SubSettingsBuilder getSubSettingsBuilder();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/SettingType.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/SettingType.java
index ba2cdcd26..7946471d7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/SettingType.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/SettingType.java
@@ -1,9 +1,5 @@
 package net.codingarea.challenges.plugin.challenges.custom.settings;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public enum SettingType {
 
 	CONDITION,
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/ChallengeAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/ChallengeAction.java
index 10e2cb0f3..56f9a5b34 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/ChallengeAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/ChallengeAction.java
@@ -11,10 +11,6 @@
 import java.util.LinkedHashMap;
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ChallengeAction extends ChallengeSetting implements
 		IChallengeAction {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/EntityTargetAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/EntityTargetAction.java
index b47bde891..f34860630 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/EntityTargetAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/EntityTargetAction.java
@@ -4,10 +4,6 @@
 
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class EntityTargetAction extends ChallengeAction implements IEntityTargetAction {
 
 	public EntityTargetAction(String name,
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IChallengeAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IChallengeAction.java
index 7b22dc3ae..fe2536bf4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IChallengeAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IChallengeAction.java
@@ -5,10 +5,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public interface IChallengeAction {
 
 	IRandom random = IRandom.create();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IEntityTargetAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IEntityTargetAction.java
index 02324016d..6ac64ace4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IEntityTargetAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/IEntityTargetAction.java
@@ -15,10 +15,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public interface IEntityTargetAction extends IChallengeAction {
 
 	static List<Entity> getTargets(Entity triggerTarget, Map<String, String[]> subActions) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/PlayerTargetAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/PlayerTargetAction.java
index 2a7530283..2e9b11cad 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/PlayerTargetAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/PlayerTargetAction.java
@@ -7,10 +7,6 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class PlayerTargetAction extends EntityTargetAction {
 
 	public PlayerTargetAction(String name, SubSettingsBuilder subSettingsBuilder) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/AddPermanentEffectAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/AddPermanentEffectAction.java
index bb7029e57..a840f4134 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/AddPermanentEffectAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/AddPermanentEffectAction.java
@@ -9,10 +9,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class AddPermanentEffectAction extends PlayerTargetAction {
 
 	PermanentEffectOnDamageChallenge instance = AbstractChallenge
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/BoostEntityInAirAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/BoostEntityInAirAction.java
index b9f2ebc25..2d27dd98a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/BoostEntityInAirAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/BoostEntityInAirAction.java
@@ -12,10 +12,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class BoostEntityInAirAction extends EntityTargetAction {
 
 	public BoostEntityInAirAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/CancelEventAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/CancelEventAction.java
index 1266600d9..717aa170c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/CancelEventAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/CancelEventAction.java
@@ -6,10 +6,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class CancelEventAction extends ChallengeAction {
 
 	public static boolean inCanceling;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ChangeWorldBorderAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ChangeWorldBorderAction.java
index efc08ba00..e8a231c5c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ChangeWorldBorderAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ChangeWorldBorderAction.java
@@ -13,10 +13,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 public class ChangeWorldBorderAction extends ChallengeAction {
 
 	public ChangeWorldBorderAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ClearInventoryAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ClearInventoryAction.java
index 2b6fab87c..142e3a0ca 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ClearInventoryAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ClearInventoryAction.java
@@ -7,10 +7,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class ClearInventoryAction extends PlayerTargetAction {
 
 	public ClearInventoryAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DamageEntityAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DamageEntityAction.java
index 3638cf70e..8120fbc93 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DamageEntityAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DamageEntityAction.java
@@ -10,10 +10,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class DamageEntityAction extends EntityTargetAction {
 
 	public DamageEntityAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DropRandomItemAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DropRandomItemAction.java
index 6accab785..6e38e0df8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DropRandomItemAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/DropRandomItemAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class DropRandomItemAction extends PlayerTargetAction {
 
 	public DropRandomItemAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ExecuteCommandAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ExecuteCommandAction.java
index 0ac2d384b..a66818c4f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ExecuteCommandAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ExecuteCommandAction.java
@@ -13,10 +13,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class ExecuteCommandAction extends PlayerTargetAction {
 
 	// Static because cannot be accessed before super has been called
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/FreezeAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/FreezeAction.java
index 2a513836d..8cb0ef400 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/FreezeAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/FreezeAction.java
@@ -10,10 +10,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class FreezeAction extends EntityTargetAction {
 
 	FreezeChallenge instance = AbstractChallenge
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java
index 481823ef1..650269296 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HealEntityAction.java
@@ -15,10 +15,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class HealEntityAction extends EntityTargetAction {
 
 	public HealEntityAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HungerPlayerAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HungerPlayerAction.java
index 791a0aafd..c7f724f8c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HungerPlayerAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/HungerPlayerAction.java
@@ -9,10 +9,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class HungerPlayerAction extends PlayerTargetAction {
 
 	public HungerPlayerAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/InvertHealthAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/InvertHealthAction.java
index 96d8ad6d4..9a77d7833 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/InvertHealthAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/InvertHealthAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class InvertHealthAction extends PlayerTargetAction {
 
 	public InvertHealthAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/JumpAndRunAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/JumpAndRunAction.java
index 612798911..abc8c20a0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/JumpAndRunAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/JumpAndRunAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class JumpAndRunAction extends ChallengeAction {
 
 	public JumpAndRunAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/KillEntityAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/KillEntityAction.java
index 6e34ac4e3..86cb4aef3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/KillEntityAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/KillEntityAction.java
@@ -10,10 +10,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class KillEntityAction extends EntityTargetAction {
 
 	public KillEntityAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ModifyMaxHealthAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ModifyMaxHealthAction.java
index 7075c9e34..5d67e6931 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ModifyMaxHealthAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/ModifyMaxHealthAction.java
@@ -13,10 +13,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class ModifyMaxHealthAction extends PlayerTargetAction {
 
 	public ModifyMaxHealthAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PlaceStructureAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PlaceStructureAction.java
index 02414dcf5..ed40d21b7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PlaceStructureAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PlaceStructureAction.java
@@ -15,10 +15,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.2
- */
 @RequireVersion(MinecraftVersion.V1_19)
 @FallbackNames({"place_random_structure"})
 public class PlaceStructureAction extends EntityTargetAction {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PotionEffectAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PotionEffectAction.java
index ece861d40..13d39ea39 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PotionEffectAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/PotionEffectAction.java
@@ -11,10 +11,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class PotionEffectAction extends EntityTargetAction {
 
 	public PotionEffectAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomHotBarAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomHotBarAction.java
index d5a8b45fa..5db7eb72f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomHotBarAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomHotBarAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 public class RandomHotBarAction extends PlayerTargetAction {
 
 	public RandomHotBarAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomItemAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomItemAction.java
index de465769b..4898806ff 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomItemAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomItemAction.java
@@ -12,10 +12,6 @@
 import javax.annotation.Nonnull;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class RandomItemAction extends ChallengeAction {
 
 	public RandomItemAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomMobAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomMobAction.java
index 803a4125b..e6f441044 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomMobAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomMobAction.java
@@ -14,10 +14,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class RandomMobAction extends EntityTargetAction {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomPotionEffectAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomPotionEffectAction.java
index c9569eaec..84c62efe5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomPotionEffectAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RandomPotionEffectAction.java
@@ -11,10 +11,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class RandomPotionEffectAction extends EntityTargetAction {
 
 	public RandomPotionEffectAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RemoveRandomItemAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RemoveRandomItemAction.java
index b64f82cd5..fdfff7d12 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RemoveRandomItemAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/RemoveRandomItemAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class RemoveRandomItemAction extends PlayerTargetAction {
 
 	public RemoveRandomItemAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SpawnEntityAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SpawnEntityAction.java
index 9b4e274dc..ffae33903 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SpawnEntityAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SpawnEntityAction.java
@@ -10,10 +10,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 public class SpawnEntityAction extends EntityTargetAction {
 
 	public SpawnEntityAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomItemAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomItemAction.java
index aa1108649..f11ce7f4b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomItemAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomItemAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class SwapRandomItemAction extends PlayerTargetAction {
 
 	public SwapRandomItemAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomMobAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomMobAction.java
index d1ced3607..a2b89f1a0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomMobAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/SwapRandomMobAction.java
@@ -16,10 +16,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class SwapRandomMobAction extends ChallengeAction {
 
 	public SwapRandomMobAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/UncraftInventoryAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/UncraftInventoryAction.java
index 389740395..01580348f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/UncraftInventoryAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/UncraftInventoryAction.java
@@ -9,10 +9,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class UncraftInventoryAction extends EntityTargetAction {
 
 	public UncraftInventoryAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WaterMLGAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WaterMLGAction.java
index 77e938477..e025fb7b9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WaterMLGAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WaterMLGAction.java
@@ -8,10 +8,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class WaterMLGAction extends ChallengeAction {
 
 	public WaterMLGAction(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WinChallengeAction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WinChallengeAction.java
index bb81ba045..9668ca307 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WinChallengeAction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/action/impl/WinChallengeAction.java
@@ -12,10 +12,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 public class WinChallengeAction extends PlayerTargetAction {
 
 	private final List<Player> winner = Lists.newLinkedList();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java
index 57e40c03b..5f9fed98a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/SubSettingsBuilder.java
@@ -15,10 +15,6 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class SubSettingsBuilder {
 
 	private String key;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/ValueSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/ValueSetting.java
index 0cda0cae3..3e3fcce3c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/ValueSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/ValueSetting.java
@@ -4,10 +4,6 @@
 import net.anweisen.utilities.bukkit.utils.menu.MenuClickInfo;
 import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ValueSetting {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseItemSubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseItemSubSettingsBuilder.java
index 677844ee0..29c9df582 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseItemSubSettingsBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseItemSubSettingsBuilder.java
@@ -16,10 +16,6 @@
 import java.util.Map.Entry;
 import java.util.function.Consumer;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Getter
 public class ChooseItemSubSettingsBuilder extends GeneratorSubSettingsBuilder {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseMultipleItemSubSettingBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseMultipleItemSubSettingBuilder.java
index ea78e50f7..25b07a132 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseMultipleItemSubSettingBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ChooseMultipleItemSubSettingBuilder.java
@@ -18,10 +18,6 @@
 import java.util.Map.Entry;
 import java.util.function.Consumer;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Getter
 public class ChooseMultipleItemSubSettingBuilder extends GeneratorSubSettingsBuilder {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/EmptySubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/EmptySubSettingsBuilder.java
index 460189c54..a68a92d51 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/EmptySubSettingsBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/EmptySubSettingsBuilder.java
@@ -8,10 +8,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class EmptySubSettingsBuilder extends SubSettingsBuilder {
 
 	public EmptySubSettingsBuilder() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/GeneratorSubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/GeneratorSubSettingsBuilder.java
index c8626503b..9d7775db7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/GeneratorSubSettingsBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/GeneratorSubSettingsBuilder.java
@@ -6,10 +6,6 @@
 import net.codingarea.challenges.plugin.management.menu.generator.implementation.custom.IParentCustomGenerator;
 import org.bukkit.entity.Player;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public abstract class GeneratorSubSettingsBuilder extends SubSettingsBuilder {
 
 	public GeneratorSubSettingsBuilder(String key) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/TextInputSubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/TextInputSubSettingsBuilder.java
index 85282033a..2a42f29a0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/TextInputSubSettingsBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/TextInputSubSettingsBuilder.java
@@ -17,10 +17,6 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class TextInputSubSettingsBuilder extends SubSettingsBuilder {
 
 	private final Consumer<Player> onOpen;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ValueSubSettingsBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ValueSubSettingsBuilder.java
index f86fd7cd8..35df97b57 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ValueSubSettingsBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/builder/ValueSubSettingsBuilder.java
@@ -22,10 +22,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Getter
 public class ValueSubSettingsBuilder extends GeneratorSubSettingsBuilder {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/BooleanSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/BooleanSetting.java
index db1fa78e4..8296a8fb3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/BooleanSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/BooleanSetting.java
@@ -5,10 +5,6 @@
 import net.codingarea.challenges.plugin.utils.item.DefaultItem;
 import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class BooleanSetting extends ValueSetting {
 
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/ModifierSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/ModifierSetting.java
index b9dcbb68a..ff3e5f2c3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/ModifierSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/sub/impl/ModifierSetting.java
@@ -10,10 +10,6 @@
 
 import java.util.function.Function;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class ModifierSetting extends ValueSetting implements IModifier {
 
 	private final int min, max;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/ChallengeTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/ChallengeTrigger.java
index cec2dd627..4cc577cfb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/ChallengeTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/ChallengeTrigger.java
@@ -10,10 +10,6 @@
 import java.util.LinkedHashMap;
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ChallengeTrigger extends ChallengeSetting implements
 		IChallengeTrigger {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/IChallengeTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/IChallengeTrigger.java
index 221be45d7..48f7f468e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/IChallengeTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/IChallengeTrigger.java
@@ -3,10 +3,6 @@
 import net.codingarea.challenges.plugin.challenges.custom.settings.ChallengeExecutionData;
 import org.bukkit.event.Listener;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public interface IChallengeTrigger extends Listener {
 
 	default ChallengeExecutionData createData() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/AdvancementTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/AdvancementTrigger.java
index 4964ccce3..cc26df8f2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/AdvancementTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/AdvancementTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerAdvancementDoneEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class AdvancementTrigger extends ChallengeTrigger {
 
 	public AdvancementTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/BreakBlockTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/BreakBlockTrigger.java
index 21f259a3a..12e06c8a1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/BreakBlockTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/BreakBlockTrigger.java
@@ -7,10 +7,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class BreakBlockTrigger extends ChallengeTrigger {
 
 	public BreakBlockTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/ConsumeItemTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/ConsumeItemTrigger.java
index b86324d7a..9c2aed119 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/ConsumeItemTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/ConsumeItemTrigger.java
@@ -12,10 +12,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class ConsumeItemTrigger extends ChallengeTrigger {
 
 	public ConsumeItemTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/CraftItemTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/CraftItemTrigger.java
index add46c5ff..f248ad991 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/CraftItemTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/CraftItemTrigger.java
@@ -7,10 +7,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.CraftItemEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class CraftItemTrigger extends ChallengeTrigger {
 
 	public CraftItemTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/DropItemTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/DropItemTrigger.java
index 26d80deaa..815e2d103 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/DropItemTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/DropItemTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerDropItemEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class DropItemTrigger extends ChallengeTrigger {
 
 	public DropItemTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageByPlayerTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageByPlayerTrigger.java
index 953a7e21e..98e4366cf 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageByPlayerTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageByPlayerTrigger.java
@@ -9,10 +9,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class EntityDamageByPlayerTrigger extends ChallengeTrigger {
 
 	public EntityDamageByPlayerTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageTrigger.java
index a17367b28..84b823770 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDamageTrigger.java
@@ -17,10 +17,6 @@
 import javax.annotation.Nonnull;
 import java.util.*;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class EntityDamageTrigger extends ChallengeTrigger {
 
 	public EntityDamageTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDeathTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDeathTrigger.java
index c5735d0af..625c5505e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDeathTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/EntityDeathTrigger.java
@@ -9,10 +9,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class EntityDeathTrigger extends ChallengeTrigger {
 
 	public EntityDeathTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GainXPTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GainXPTrigger.java
index 442e676e8..d453b69ec 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GainXPTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GainXPTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerExpChangeEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class GainXPTrigger extends ChallengeTrigger {
 
 	public GainXPTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GetItemTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GetItemTrigger.java
index d15859def..9b087f37b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GetItemTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/GetItemTrigger.java
@@ -7,10 +7,6 @@
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 public class GetItemTrigger extends ChallengeTrigger {
 
 	public GetItemTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java
index 05aed6c46..60e32c9a8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/HungerTrigger.java
@@ -7,10 +7,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class HungerTrigger extends ChallengeTrigger {
 
 	public HungerTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/InLiquidTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/InLiquidTrigger.java
index ef74275e4..cc7020df3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/InLiquidTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/InLiquidTrigger.java
@@ -15,10 +15,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class InLiquidTrigger extends ChallengeTrigger {
 
 	public InLiquidTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/IntervallTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/IntervallTrigger.java
index 5d34447b9..b3217aaab 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/IntervallTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/IntervallTrigger.java
@@ -12,10 +12,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class IntervallTrigger extends ChallengeTrigger {
 
 	public IntervallTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/LevelUpTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/LevelUpTrigger.java
index 7e895e6a8..a95ea5de9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/LevelUpTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/LevelUpTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerLevelChangeEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class LevelUpTrigger extends ChallengeTrigger {
 
 	public LevelUpTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveBlockTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveBlockTrigger.java
index 8fb3639ac..03de99396 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveBlockTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveBlockTrigger.java
@@ -7,10 +7,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class MoveBlockTrigger extends ChallengeTrigger {
 
 	public MoveBlockTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveCameraTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveCameraTrigger.java
index 566b96d71..d203be81d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveCameraTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveCameraTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class MoveCameraTrigger extends ChallengeTrigger {
 
 	public MoveCameraTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveDownTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveDownTrigger.java
index 8623c2f49..e16df9e1b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveDownTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveDownTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class MoveDownTrigger extends ChallengeTrigger {
 
 	public MoveDownTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveUpTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveUpTrigger.java
index 044e12a06..d2bd8d42f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveUpTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/MoveUpTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class MoveUpTrigger extends ChallengeTrigger {
 
 	public MoveUpTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PickupItemTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PickupItemTrigger.java
index 4db6072ce..18192a54e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PickupItemTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PickupItemTrigger.java
@@ -6,10 +6,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class PickupItemTrigger extends ChallengeTrigger {
 
 	public PickupItemTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlaceBlockTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlaceBlockTrigger.java
index b17e482d1..9b6de5cdc 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlaceBlockTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlaceBlockTrigger.java
@@ -7,10 +7,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockPlaceEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class PlaceBlockTrigger extends ChallengeTrigger {
 
 	public PlaceBlockTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerJumpTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerJumpTrigger.java
index c5c99d95e..37d5ca5be 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerJumpTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerJumpTrigger.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class PlayerJumpTrigger extends ChallengeTrigger {
 
 	public PlayerJumpTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerSneakTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerSneakTrigger.java
index 198a7f90a..a5b2da478 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerSneakTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/PlayerSneakTrigger.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1
- */
 public class PlayerSneakTrigger extends ChallengeTrigger {
 
 	public PlayerSneakTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsNotOnSpecificBlockTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsNotOnSpecificBlockTrigger.java
index fd880281e..a53a775ed 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsNotOnSpecificBlockTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsNotOnSpecificBlockTrigger.java
@@ -14,10 +14,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class StandsNotOnSpecificBlockTrigger extends ChallengeTrigger {
 
 	public StandsNotOnSpecificBlockTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java
index 86d4f9069..96b126bd4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/custom/settings/trigger/impl/StandsOnSpecificBlockTrigger.java
@@ -9,10 +9,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class StandsOnSpecificBlockTrigger extends ChallengeTrigger {
 
 	public StandsOnSpecificBlockTrigger(String name) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/DamageTeleportChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/DamageTeleportChallenge.java
index 59c5999fa..f84d8d37f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/DamageTeleportChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/DamageTeleportChallenge.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import java.util.concurrent.ThreadLocalRandom;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class DamageTeleportChallenge extends SettingModifier {
 
@@ -85,4 +81,4 @@ public Location getRandomLocation(World world) {
 		return world.getWorldBorder().getCenter().add(randomX, 0, randomY);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java
index 33b85cbb4..593c12203 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/ZeroHeartsChallenge.java
@@ -27,10 +27,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class ZeroHeartsChallenge extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/AdvancementDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/AdvancementDamageChallenge.java
index 36d98cd0f..d3d23f051 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/AdvancementDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/AdvancementDamageChallenge.java
@@ -14,10 +14,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class AdvancementDamageChallenge extends SettingModifier {
 
 	public AdvancementDamageChallenge() {
@@ -52,4 +48,4 @@ public void onPlayerAdvancementDone(@Nonnull PlayerAdvancementDoneEvent event) {
 		event.getPlayer().damage(getValue());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockBreakDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockBreakDamageChallenge.java
index deea32241..4b9c86806 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockBreakDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockBreakDamageChallenge.java
@@ -13,11 +13,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class BlockBreakDamageChallenge extends SettingModifier {
 
 	public BlockBreakDamageChallenge() {
@@ -49,4 +44,4 @@ protected String[] getSettingsDescription() {
 		return Message.forName("item-heart-damage-description").asArray(getValue() / 2f);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockPlaceDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockPlaceDamageChallenge.java
index 19400f792..f2a10abb6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockPlaceDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/BlockPlaceDamageChallenge.java
@@ -14,11 +14,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class BlockPlaceDamageChallenge extends SettingModifier {
 
@@ -51,4 +46,4 @@ protected String[] getSettingsDescription() {
 		return Message.forName("item-heart-damage-description").asArray(getValue() / 2f);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DamagePerBlockChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DamagePerBlockChallenge.java
index 75c1cec12..c0ae72c54 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DamagePerBlockChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DamagePerBlockChallenge.java
@@ -17,10 +17,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class DamagePerBlockChallenge extends SettingModifier {
 
 	public DamagePerBlockChallenge() {
@@ -55,4 +51,4 @@ protected String[] getSettingsDescription() {
 		return Message.forName("item-heart-damage-description").asArray(getValue() / 2f);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DeathOnFallChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DeathOnFallChallenge.java
index f459ecbbf..43570f302 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DeathOnFallChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DeathOnFallChallenge.java
@@ -15,10 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class DeathOnFallChallenge extends Setting {
 
@@ -44,4 +40,4 @@ public void onEntityDamage(@Nonnull EntityDamageEvent event) {
 		event.setCancelled(false);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DelayDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DelayDamageChallenge.java
index d8bc6aee1..320d562d6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DelayDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/DelayDamageChallenge.java
@@ -20,11 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author rollocraft | https://github.com/rollocraft
- * @since 2.3.2
- */
-
 @Since("2.3.2")
 public class DelayDamageChallenge extends TimedChallenge {
 
@@ -87,4 +82,4 @@ public void onPlayerDamage(@Nonnull EntityDamageEvent event) {
     damageMap.put(player, damageMap.getOrDefault(player, 0.0) + damage);
     event.setCancelled(true);
   }
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/FreezeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/FreezeChallenge.java
index 29557fad9..f83e0cd12 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/FreezeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/FreezeChallenge.java
@@ -19,10 +19,6 @@
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.potion.PotionEffect;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class FreezeChallenge extends SettingModifier {
 
@@ -77,4 +73,4 @@ public void setFreeze(LivingEntity entity, double damage) {
 		entity.addPotionEffect(new PotionEffect(MinecraftNameWrapper.SLOWNESS, time, 255));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/JumpDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/JumpDamageChallenge.java
index c4b32de44..d7ca9212c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/JumpDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/JumpDamageChallenge.java
@@ -19,10 +19,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class JumpDamageChallenge extends SettingModifier {
 
@@ -58,4 +54,4 @@ public void onSneak(@Nonnull PlayerJumpEvent event) {
 		event.getPlayer().setNoDamageTicks(0);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/ReversedDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/ReversedDamageChallenge.java
index 26bbe5c40..7be4a0e9b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/ReversedDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/ReversedDamageChallenge.java
@@ -12,10 +12,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class ReversedDamageChallenge extends Setting {
 
 	public ReversedDamageChallenge() {
@@ -38,4 +34,4 @@ public void onDamageByPlayer(@Nonnull EntityDamageByPlayerEvent event) {
 		event.getDamager().damage(damage);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/SneakDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/SneakDamageChallenge.java
index 6b155969a..1ba29b8cf 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/SneakDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/SneakDamageChallenge.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class SneakDamageChallenge extends SettingModifier {
 
 	public SneakDamageChallenge() {
@@ -57,4 +53,4 @@ public void onSneak(@Nonnull PlayerToggleSneakEvent event) {
 		event.getPlayer().setNoDamageTicks(0);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/WaterAllergyChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/WaterAllergyChallenge.java
index 4ba093c91..f6b269788 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/WaterAllergyChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/damage/WaterAllergyChallenge.java
@@ -15,10 +15,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class WaterAllergyChallenge extends SettingModifier {
 
@@ -55,4 +51,4 @@ public void playValueChangeTitle() {
 		ChallengeHelper.playChallengeHeartsValueChangeTitle(this);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/BlockEffectChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/BlockEffectChallenge.java
index adc63f9af..a9d565725 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/BlockEffectChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/BlockEffectChallenge.java
@@ -32,10 +32,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class BlockEffectChallenge extends Setting {
 
@@ -171,4 +167,4 @@ private PotionEffect getEffect(Material material) {
 		return type.createEffect(Integer.MAX_VALUE, random.nextInt(type.isInstant() ? 1 : 4));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/ChunkRandomEffectChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/ChunkRandomEffectChallenge.java
index 9778b22ff..7898e893e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/ChunkRandomEffectChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/ChunkRandomEffectChallenge.java
@@ -28,10 +28,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 @Since("2.1.1")
 public class ChunkRandomEffectChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/EntityRandomEffectChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/EntityRandomEffectChallenge.java
index 97fa07e7a..8296da817 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/EntityRandomEffectChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/EntityRandomEffectChallenge.java
@@ -18,10 +18,6 @@
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class EntityRandomEffectChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/InfectionChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/InfectionChallenge.java
index 3df770351..5d088d268 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/InfectionChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/InfectionChallenge.java
@@ -20,10 +20,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class InfectionChallenge extends Setting {
 
 	public InfectionChallenge() {
@@ -95,4 +91,4 @@ private List<Entity> getNearbyTargets(@Nonnull Player player, double range) {
 						&& ((Player) entity).getGameMode() != GameMode.SPECTATOR)).collect(Collectors.toList());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/PermanentEffectOnDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/PermanentEffectOnDamageChallenge.java
index b24d137c2..cade26f94 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/PermanentEffectOnDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/PermanentEffectOnDamageChallenge.java
@@ -37,10 +37,6 @@
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class PermanentEffectOnDamageChallenge extends SettingModifier {
 
@@ -281,4 +277,4 @@ public void loadGameState(@Nonnull Document document) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java
index 460ac6333..8895945de 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/effect/RandomPotionEffectChallenge.java
@@ -24,10 +24,6 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class RandomPotionEffectChallenge extends MenuSetting {
 
@@ -110,4 +106,4 @@ private void applyEffect(@Nonnull Player player, @Nonnull PotionEffectType effec
 		player.addPotionEffect(potionEffect);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/AllMobsToDeathPoint.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/AllMobsToDeathPoint.java
index 89b517a93..6db0b57f0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/AllMobsToDeathPoint.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/AllMobsToDeathPoint.java
@@ -15,10 +15,6 @@
 import javax.annotation.Nonnull;
 import java.util.Collection;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class AllMobsToDeathPoint extends Setting {
 
@@ -54,4 +50,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.SPAWNER, Message.forName("item-all-mobs-to-death-position-challenge"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java
index 9b8c31477..ef714960f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/BlockMobsChallenge.java
@@ -23,10 +23,6 @@
 
 import java.util.Collection;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 @Since("2.1.3")
 public class BlockMobsChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/DupedSpawningChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/DupedSpawningChallenge.java
index 19e3002f2..9d9934636 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/DupedSpawningChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/DupedSpawningChallenge.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class DupedSpawningChallenge extends Setting {
 
 	private boolean inCustomSpawn = false;
@@ -50,4 +46,4 @@ public void onSpawn(@Nonnull EntitySpawnEvent event) {
 		inCustomSpawn = false;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraNormalChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraNormalChallenge.java
index 1231cb7e6..3a359fa42 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraNormalChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraNormalChallenge.java
@@ -10,10 +10,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class HydraNormalChallenge extends HydraChallenge {
 
 	public HydraNormalChallenge() {
@@ -31,4 +27,4 @@ public ItemBuilder createDisplayItem() {
 	public int getNewMobsCount(@Nonnull EntityType entityType) {
 		return 2;
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraPlusChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraPlusChallenge.java
index 98ed37433..835fd5585 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraPlusChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/HydraPlusChallenge.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class HydraPlusChallenge extends HydraChallenge {
 
@@ -43,4 +39,4 @@ public int getNewMobsCount(@Nonnull EntityType entityType) {
 		return currentCount;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/InvisibleMobsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/InvisibleMobsChallenge.java
index 4b1d8b2f5..24e76bf86 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/InvisibleMobsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/InvisibleMobsChallenge.java
@@ -23,10 +23,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class InvisibleMobsChallenge extends Setting {
 
@@ -72,4 +68,4 @@ private void addEffect(@Nonnull LivingEntity entity) {
 		entity.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 40, 1, true, false, false));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobSightDamageChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobSightDamageChallenge.java
index 8d17dffa7..4d1283419 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobSightDamageChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobSightDamageChallenge.java
@@ -19,10 +19,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MobSightDamageChallenge extends SettingModifier {
 
@@ -78,4 +74,4 @@ public void onTick() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobTransformationChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobTransformationChallenge.java
index 613b59218..47e444a1e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobTransformationChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobTransformationChallenge.java
@@ -19,10 +19,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MobTransformationChallenge extends Setting {
 
@@ -78,4 +74,4 @@ private EntityType getType(@Nonnull Player player, @Nullable EntityType defaultT
 		return type;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobsRespawnInEndChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobsRespawnInEndChallenge.java
index f49715813..bc34c69b3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobsRespawnInEndChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/MobsRespawnInEndChallenge.java
@@ -26,10 +26,6 @@
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class MobsRespawnInEndChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/NewEntityOnJumpChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/NewEntityOnJumpChallenge.java
index a7c6758bd..8ed950886 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/NewEntityOnJumpChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/NewEntityOnJumpChallenge.java
@@ -18,10 +18,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class NewEntityOnJumpChallenge extends Setting {
 
@@ -49,4 +45,4 @@ private void spawnRandomEntity(@Nonnull Location location) {
 		location.getWorld().spawnEntity(location, type);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/StoneSightChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/StoneSightChallenge.java
index 4c48c5c87..7f85c657e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/StoneSightChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/entities/StoneSightChallenge.java
@@ -20,10 +20,6 @@
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class StoneSightChallenge extends Setting {
 
@@ -86,4 +82,4 @@ private Material getRandomStone() {
 		return materials[random.nextInt(materials.length)];
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/JumpAndRunChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/JumpAndRunChallenge.java
index beeba0d04..d9be4fb72 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/JumpAndRunChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/JumpAndRunChallenge.java
@@ -35,10 +35,6 @@
 import java.util.Optional;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class JumpAndRunChallenge extends WorldDependentChallenge {
 
 	private final List<UUID> lastPlayers = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/WaterMLGChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/WaterMLGChallenge.java
index 0f66bad4d..17fcfe654 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/WaterMLGChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/extraworld/WaterMLGChallenge.java
@@ -21,10 +21,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class WaterMLGChallenge extends WorldDependentChallenge {
 
 	public WaterMLGChallenge() {
@@ -97,4 +93,4 @@ public void onEntityDamage(@Nonnull EntityDamageEvent event) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBiomeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBiomeChallenge.java
index 9ab4bfea8..e9be24ecc 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBiomeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBiomeChallenge.java
@@ -31,10 +31,6 @@
 import java.util.Objects;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 @ExcludeFromRandomChallenges
 public class ForceBiomeChallenge extends CompletableForceChallenge {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBlockChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBlockChallenge.java
index c27761db1..d72b25a1b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBlockChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceBlockChallenge.java
@@ -25,10 +25,6 @@
 import java.util.Arrays;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @ExcludeFromRandomChallenges
 public class ForceBlockChallenge extends EndingForceChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceHeightChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceHeightChallenge.java
index 5ebda733f..1de673480 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceHeightChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceHeightChallenge.java
@@ -24,10 +24,6 @@
 import javax.annotation.Nullable;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @ExcludeFromRandomChallenges
 public class ForceHeightChallenge extends EndingForceChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceItemChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceItemChallenge.java
index d34ddfb01..f589ddc4b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceItemChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceItemChallenge.java
@@ -35,10 +35,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 @ExcludeFromRandomChallenges
 public class ForceItemChallenge extends CompletableForceChallenge {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceMobChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceMobChallenge.java
index d61d44419..54fbc8b28 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceMobChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/force/ForceMobChallenge.java
@@ -30,10 +30,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @ExcludeFromRandomChallenges
 public class ForceMobChallenge extends CompletableForceChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/DamageInventoryClearChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/DamageInventoryClearChallenge.java
index 01f9f84e6..3c9f20982 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/DamageInventoryClearChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/DamageInventoryClearChallenge.java
@@ -15,10 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class DamageInventoryClearChallenge extends SettingModifier {
 
 	public DamageInventoryClearChallenge() {
@@ -61,4 +57,4 @@ public void playValueChangeTitle() {
 		ChallengeHelper.playChangeChallengeValueTitle(this, getValue() == 0 ? Message.forName("everyone").asString() : Message.forName("player").asString());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MissingItemsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MissingItemsChallenge.java
index b09bda1b3..decb35544 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MissingItemsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MissingItemsChallenge.java
@@ -39,10 +39,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MissingItemsChallenge extends TimedChallenge implements PlayerCommand {
 
@@ -241,4 +237,4 @@ private boolean anyRunningGame() {
 		return inventories.keySet().stream().anyMatch(uuid -> Bukkit.getOfflinePlayer(uuid).isOnline());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MovementItemRemovingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MovementItemRemovingChallenge.java
index ac95eb420..7a2504bc3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MovementItemRemovingChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/MovementItemRemovingChallenge.java
@@ -17,10 +17,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MovementItemRemovingChallenge extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/NoDupedItemsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/NoDupedItemsChallenge.java
index 51da623b2..54081b17e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/NoDupedItemsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/NoDupedItemsChallenge.java
@@ -28,10 +28,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 @CanInstaKillOnEnable
 public class NoDupedItemsChallenge extends Setting {
@@ -114,4 +110,4 @@ private Triple<Player, Player, Material> checkInventory(@Nonnull Player player,
 		return null;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java
index 23db0cc55..37d0671ce 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PermanentItemChallenge.java
@@ -18,10 +18,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class PermanentItemChallenge extends Setting {
 
@@ -61,4 +57,4 @@ public void onPlayerDropItem(@Nonnull PlayerDropItemEvent event) {
 		event.setCancelled(true);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PickupItemLaunchChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PickupItemLaunchChallenge.java
index bc6adbf8f..90d325935 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PickupItemLaunchChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/PickupItemLaunchChallenge.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class PickupItemLaunchChallenge extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java
index ed181731a..67b61ed2a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/inventory/UncraftItemsChallenge.java
@@ -18,10 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class UncraftItemsChallenge extends TimedChallenge {
 
@@ -141,4 +137,4 @@ protected void onTimeActivation() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java
index 7eb4622a2..cc621e5c7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/EnderGamesChallenge.java
@@ -20,10 +20,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class EnderGamesChallenge extends TimedChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodLaunchChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodLaunchChallenge.java
index ed708272d..7c1b57e4d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodLaunchChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodLaunchChallenge.java
@@ -17,10 +17,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class FoodLaunchChallenge extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodOnceChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodOnceChallenge.java
index b657d8573..354eacae6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodOnceChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/FoodOnceChallenge.java
@@ -17,10 +17,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class FoodOnceChallenge extends SettingModifier {
 
 	public FoodOnceChallenge() {
@@ -108,4 +104,4 @@ private boolean teamFoodsActivated() {
 		return getValue() == 2;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/InvertHealthChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/InvertHealthChallenge.java
index 99f3f1429..dd9640cfd 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/InvertHealthChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/InvertHealthChallenge.java
@@ -16,10 +16,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 @ExcludeFromRandomChallenges
 public class InvertHealthChallenge extends TimedChallenge {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/LowDropRateChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/LowDropRateChallenge.java
index 9eba3fa27..eaca7adcb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/LowDropRateChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/LowDropRateChallenge.java
@@ -16,10 +16,6 @@
 import java.util.Arrays;
 import java.util.Random;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class LowDropRateChallenge extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoExpChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoExpChallenge.java
index b0e4086e0..1383b56fe 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoExpChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoExpChallenge.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class NoExpChallenge extends Setting {
 
 	public NoExpChallenge() {
@@ -39,4 +35,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.EXPERIENCE_BOTTLE, Message.forName("item-no-exp-challenge"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java
index f85c099b0..19239e2d2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoSharedAdvancementsChallenge.java
@@ -19,10 +19,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 @Since("2.2.0")
 public class NoSharedAdvancementsChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoTradingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoTradingChallenge.java
index fe5d0aaa4..f0a09e06d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoTradingChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/NoTradingChallenge.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class NoTradingChallenge extends Setting {
 
 	public NoTradingChallenge() {
@@ -50,4 +46,4 @@ public void onEntityPickupItem(@Nonnull EntityPickupItemEvent event) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/OneDurabilityChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/OneDurabilityChallenge.java
index 270c344d5..ed2c5fa85 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/OneDurabilityChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/miscellaneous/OneDurabilityChallenge.java
@@ -17,10 +17,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class OneDurabilityChallenge extends Setting {
 
 	public OneDurabilityChallenge() {
@@ -69,4 +65,4 @@ private void setDurability(@Nonnull ItemStack item) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/AlwaysRunningChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/AlwaysRunningChallenge.java
index ec9da640e..21bd6897a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/AlwaysRunningChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/AlwaysRunningChallenge.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class AlwaysRunningChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/DontStopRunningChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/DontStopRunningChallenge.java
index 4e9ab9141..74196fa3f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/DontStopRunningChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/DontStopRunningChallenge.java
@@ -21,10 +21,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class DontStopRunningChallenge extends SettingModifier {
 
@@ -104,4 +100,4 @@ public void onPlayerMove(@Nonnull PlayerMoveEvent event) {
 		playerStandingCount.remove(event.getPlayer());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/FiveHundredBlocksChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/FiveHundredBlocksChallenge.java
index f4636b09c..6376c38e7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/FiveHundredBlocksChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/FiveHundredBlocksChallenge.java
@@ -34,10 +34,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Since("2.1.0")
 public class FiveHundredBlocksChallenge extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HigherJumpsChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HigherJumpsChallenge.java
index cddb70054..8e69d18e5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HigherJumpsChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HigherJumpsChallenge.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class HigherJumpsChallenge extends Setting {
 
 	public HigherJumpsChallenge() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HungerPerBlockChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HungerPerBlockChallenge.java
index 7de505ec3..65359282a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HungerPerBlockChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/HungerPerBlockChallenge.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class HungerPerBlockChallenge extends SettingModifier {
 
@@ -41,4 +37,4 @@ public void onPlayerMove(@Nonnull PlayerMoveEvent event) {
 		event.getPlayer().setFoodLevel(Math.max(newFoodLevel, 0));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/MoveMouseDamage.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/MoveMouseDamage.java
index faba24856..f31e51b72 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/MoveMouseDamage.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/MoveMouseDamage.java
@@ -23,10 +23,6 @@
 import java.util.Map.Entry;
 import java.util.UUID;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MoveMouseDamage extends SettingModifier {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDirtChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDirtChallenge.java
index 481e9a674..a642787b5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDirtChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDirtChallenge.java
@@ -20,10 +20,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 @CanInstaKillOnEnable
 public class OnlyDirtChallenge extends Setting {
 
@@ -69,4 +65,4 @@ public void onBlockSpread(@Nonnull BlockSpreadEvent event) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDownChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDownChallenge.java
index a5128eb07..8cbe2613b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDownChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/OnlyDownChallenge.java
@@ -15,10 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class OnlyDownChallenge extends Setting {
 
@@ -43,4 +39,4 @@ public void onPlayerMove(@Nonnull PlayerMoveEvent event) {
 		ChallengeHelper.kill(event.getPlayer());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/TrafficLightChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/TrafficLightChallenge.java
index c493342e1..13a0dd130 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/TrafficLightChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/movement/TrafficLightChallenge.java
@@ -21,10 +21,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.3
- */
 @Since("1.3")
 public class TrafficLightChallenge extends TimedChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java
index 214a8e015..8b0e036c3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/quiz/QuizChallenge.java
@@ -46,10 +46,6 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class QuizChallenge extends TimedChallenge implements PlayerCommand, TabCompleter {
 
 	private static QuizChallenge instance;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/BlockRandomizerChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/BlockRandomizerChallenge.java
index 390eb21f8..1bdde937a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/BlockRandomizerChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/BlockRandomizerChallenge.java
@@ -16,10 +16,6 @@
 import net.codingarea.challenges.plugin.utils.misc.ExperimentalUtils;
 import org.bukkit.Material;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class BlockRandomizerChallenge extends RandomizerSetting {
 
 	public BlockRandomizerChallenge() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/CraftingRandomizerChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/CraftingRandomizerChallenge.java
index ab20e5235..829be3904 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/CraftingRandomizerChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/CraftingRandomizerChallenge.java
@@ -15,10 +15,6 @@
 import javax.annotation.Nonnull;
 import java.util.*;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class CraftingRandomizerChallenge extends RandomizerSetting {
 
 	protected final Map<Material, Material> randomization = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java
index 3792fbbcb..5def17398 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/HotBarRandomizerChallenge.java
@@ -30,10 +30,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class HotBarRandomizerChallenge extends TimedChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/MobRandomizerChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/MobRandomizerChallenge.java
index 6259c4eb4..e08dcbe0c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/MobRandomizerChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/MobRandomizerChallenge.java
@@ -34,10 +34,6 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntitySpawnEvent;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MobRandomizerChallenge extends RandomizerSetting {
 
@@ -229,4 +225,4 @@ private int getSpawnLimit(@Nonnull World world) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomChallengeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomChallengeChallenge.java
index 5b37d22f5..e1904812f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomChallengeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomChallengeChallenge.java
@@ -20,10 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class RandomChallengeChallenge extends TimedChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java
index 596ba187b..c27737b95 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomEventChallenge.java
@@ -24,10 +24,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class RandomEventChallenge extends TimedChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemChallenge.java
index cea207c72..8ce471fdc 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemChallenge.java
@@ -13,10 +13,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class RandomItemChallenge extends TimedChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java
index dee55863e..57b92d418 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemDroppingChallenge.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class RandomItemDroppingChallenge extends TimedChallenge {
 
@@ -80,4 +76,4 @@ protected void onTimeActivation() {
 		});
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java
index aaffe7212..0f6bd79c0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemRemovingChallenge.java
@@ -15,10 +15,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class RandomItemRemovingChallenge extends TimedChallenge {
 
@@ -63,4 +59,4 @@ protected void onTimeActivation() {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java
index 76963ee39..9aef3ef61 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomItemSwappingChallenge.java
@@ -17,10 +17,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class RandomItemSwappingChallenge extends TimedChallenge {
 
@@ -85,4 +81,4 @@ protected void onTimeActivation() {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomTeleportOnHitChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomTeleportOnHitChallenge.java
index b7c22044e..ff3a10448 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomTeleportOnHitChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomTeleportOnHitChallenge.java
@@ -19,10 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 @Since("2.1.3")
 public class RandomTeleportOnHitChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java
index 8d6d841ab..ca5546d4f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/randomizer/RandomizedHPChallenge.java
@@ -31,10 +31,6 @@
 import java.util.Map;
 import java.util.Random;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class RandomizedHPChallenge extends SettingModifier {
 
 	private final Random random = new Random();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxBiomeTimeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxBiomeTimeChallenge.java
index f83daec95..1b6db8258 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxBiomeTimeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxBiomeTimeChallenge.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MaxBiomeTimeChallenge extends SettingModifier {
 
@@ -108,4 +104,4 @@ private Biome getBiome(@Nonnull Player player) {
 		return player.getLocation().getBlock().getBiome();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxHeightTimeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxHeightTimeChallenge.java
index 6c8564b9f..8d44f4d3f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxHeightTimeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/time/MaxHeightTimeChallenge.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class MaxHeightTimeChallenge extends SettingModifier {
 
@@ -103,4 +99,4 @@ private int getCurrentTime(@Nonnull Player player) {
 		return getPlayerData(player).getInt(String.valueOf(player.getLocation().getBlockY()), 0);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AllBlocksDisappearChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AllBlocksDisappearChallenge.java
index 743005f34..884d4e679 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AllBlocksDisappearChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AllBlocksDisappearChallenge.java
@@ -28,10 +28,6 @@
 import javax.annotation.Nullable;
 import java.util.*;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class AllBlocksDisappearChallenge extends MenuSetting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AnvilRainChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AnvilRainChallenge.java
index e2fb9e0f6..2a6c0c514 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AnvilRainChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/AnvilRainChallenge.java
@@ -23,10 +23,6 @@
 import java.util.List;
 import java.util.Random;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class AnvilRainChallenge extends MenuSetting {
 
 	private final Random random = new Random();
@@ -232,4 +228,4 @@ private int getHeight(int currentHeight) {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockPathChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockPathChallenge.java
index cf110f0ad..b7cb7d1d6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockPathChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockPathChallenge.java
@@ -15,11 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class BedrockPathChallenge extends Setting {
 
 	public BedrockPathChallenge() {
@@ -42,4 +37,4 @@ public void onMove(@Nonnull PlayerMoveEvent event) {
 		BlockUtils.createBlockPath(event.getFrom(), event.getTo(), Material.BEDROCK);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockWallChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockWallChallenge.java
index 8e5e013b6..4e8d42903 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockWallChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BedrockWallChallenge.java
@@ -17,11 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class BedrockWallChallenge extends SettingModifier {
 
 	public BedrockWallChallenge() {
@@ -71,4 +66,4 @@ protected String[] getSettingsDescription() {
 		return Message.forName("item-time-seconds-description").asArray(getValue());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlockFlyInAirChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlockFlyInAirChallenge.java
index b304bd2dc..8a4c39d71 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlockFlyInAirChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlockFlyInAirChallenge.java
@@ -17,10 +17,6 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 @Since("2.1.1")
 public class BlockFlyInAirChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlocksDisappearAfterTimeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlocksDisappearAfterTimeChallenge.java
index f1463439c..eaa0fee8b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlocksDisappearAfterTimeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/BlocksDisappearAfterTimeChallenge.java
@@ -20,10 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class BlocksDisappearAfterTimeChallenge extends SettingModifier {
 
@@ -70,4 +66,4 @@ private BukkitTask runTask(@Nonnull Block block) {
 		return Bukkit.getScheduler().runTaskLater(plugin, () -> block.setType(Material.AIR), getValue() * 20L);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/ChunkDeconstructionChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/ChunkDeconstructionChallenge.java
index 8c766be96..253ff1834 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/ChunkDeconstructionChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/ChunkDeconstructionChallenge.java
@@ -16,10 +16,6 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class ChunkDeconstructionChallenge extends TimedChallenge {
 
 	public ChunkDeconstructionChallenge() {
@@ -108,4 +104,4 @@ private List<Chunk> getChunksToDeconstruct() {
 		).build();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/FloorIsLavaChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/FloorIsLavaChallenge.java
index 98450318b..1252c24b0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/FloorIsLavaChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/FloorIsLavaChallenge.java
@@ -16,11 +16,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class FloorIsLavaChallenge extends SettingModifier {
 
 	public FloorIsLavaChallenge() {
@@ -64,4 +59,4 @@ protected String[] getSettingsDescription() {
 		return Message.forName("item-time-seconds-description").asArray(getValue());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/IceFloorChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/IceFloorChallenge.java
index ad7e2c3b1..fb0e5b290 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/IceFloorChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/IceFloorChallenge.java
@@ -24,10 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class IceFloorChallenge extends Setting {
 
@@ -107,4 +103,4 @@ private boolean ignoreIce(@Nonnull Player player) {
 		return ignoredPlayers.contains(player);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LevelBorderChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LevelBorderChallenge.java
index 065a821b5..921f74194 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LevelBorderChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LevelBorderChallenge.java
@@ -33,10 +33,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 @Since("2.2.3")
 @ExcludeFromRandomChallenges
 public class LevelBorderChallenge extends Setting {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java
index 0982c2576..e3c0ad6f2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/LoopChallenge.java
@@ -46,10 +46,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class LoopChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/RepeatInChunkChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/RepeatInChunkChallenge.java
index fde4a5cc4..ebad2721a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/RepeatInChunkChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/RepeatInChunkChallenge.java
@@ -34,10 +34,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 @Since("2.1.1")
 public class RepeatInChunkChallenge extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java
index 12c9573bb..7e459c445 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SnakeChallenge.java
@@ -24,10 +24,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class SnakeChallenge extends Setting {
 
 	private final ArrayList<Block> blocks = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SurfaceHoleChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SurfaceHoleChallenge.java
index 3ec66a31a..c07addb57 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SurfaceHoleChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/SurfaceHoleChallenge.java
@@ -17,11 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class SurfaceHoleChallenge extends SettingModifier {
 
 	public SurfaceHoleChallenge() {
@@ -73,4 +68,4 @@ protected String[] getSettingsDescription() {
 		return Message.forName("item-time-seconds-description").asArray(getValue());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/TsunamiChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/TsunamiChallenge.java
index e70cc0830..90189cadd 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/TsunamiChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/challenge/world/TsunamiChallenge.java
@@ -32,11 +32,6 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class TsunamiChallenge extends TimedChallenge {
 
@@ -236,4 +231,4 @@ public void loadGameState(@Nonnull Document document) {
 		lavaHeight = document.getInt("lavaHeight");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/damage/DamageRuleSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/damage/DamageRuleSetting.java
index 3aeb509e6..b5d281832 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/damage/DamageRuleSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/damage/DamageRuleSetting.java
@@ -16,10 +16,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class DamageRuleSetting extends Setting {
 
 	private final List<DamageCause> causes;
@@ -57,4 +53,4 @@ public void onDamage(@Nonnull EntityDamageEvent event) {
 		event.setCancelled(true);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/AllAdvancementGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/AllAdvancementGoal.java
index fb8893fa1..c02c60823 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/AllAdvancementGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/AllAdvancementGoal.java
@@ -26,10 +26,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Since("2.1.0")
 public class AllAdvancementGoal extends PointsGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java
index a94e89a0e..4044b6b82 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectAllItemsGoal.java
@@ -33,10 +33,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class CollectAllItemsGoal extends SettingGoal implements SenderCommand {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectHorseAmorGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectHorseAmorGoal.java
index f1d89a5f2..99b1bec22 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectHorseAmorGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectHorseAmorGoal.java
@@ -13,10 +13,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class CollectHorseAmorGoal extends ItemCollectionGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectIceBlocksGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectIceBlocksGoal.java
index 9b44217ec..42f602a26 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectIceBlocksGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectIceBlocksGoal.java
@@ -8,10 +8,6 @@
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class CollectIceBlocksGoal extends ItemCollectionGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostDeathsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostDeathsGoal.java
index 17712f8d7..6ced4873d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostDeathsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostDeathsGoal.java
@@ -15,10 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class CollectMostDeathsGoal extends CollectionGoal {
 
 	public CollectMostDeathsGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostExpGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostExpGoal.java
index 474a8099d..1131174c3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostExpGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostExpGoal.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class CollectMostExpGoal extends PointsGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostItemsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostItemsGoal.java
index 6eb21782a..2583fdc7b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostItemsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectMostItemsGoal.java
@@ -18,10 +18,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class CollectMostItemsGoal extends CollectionGoal {
 
 	public CollectMostItemsGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectSwordsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectSwordsGoal.java
index a319b6e39..dc326cc51 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectSwordsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectSwordsGoal.java
@@ -13,10 +13,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class CollectSwordsGoal extends ItemCollectionGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWoodGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWoodGoal.java
index 4ed755a9c..aefe3adc8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWoodGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWoodGoal.java
@@ -20,10 +20,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class CollectWoodGoal extends SettingModifierCollectionGoal {
 
 	private static final boolean newNether = MinecraftVersion.current().isNewerOrEqualThan(MinecraftVersion.V1_16);
@@ -129,4 +125,4 @@ private void handleCollect(@Nonnull Player player, @Nonnull Material material) {
 		});
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWorkstationsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWorkstationsGoal.java
index 4dd1c0a07..e28eb9813 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWorkstationsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/CollectWorkstationsGoal.java
@@ -10,10 +10,6 @@
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 @RequireVersion(MinecraftVersion.V1_14)
 public class CollectWorkstationsGoal extends ItemCollectionGoal {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatCakeGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatCakeGoal.java
index 1b2bc328e..8bac031bc 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatCakeGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatCakeGoal.java
@@ -18,10 +18,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class EatCakeGoal extends SettingGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatMostGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatMostGoal.java
index 3d6cc51e6..e61660347 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatMostGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/EatMostGoal.java
@@ -13,10 +13,6 @@
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 @Since("2.1.2")
 public class EatMostGoal extends PointsGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FindElytraGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FindElytraGoal.java
index c6c48042f..0a3d9b3ca 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FindElytraGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FindElytraGoal.java
@@ -8,10 +8,6 @@
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 @Since("2.1.1")
 public class FindElytraGoal extends FindItemGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FinishRaidGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FinishRaidGoal.java
index 09600e547..61e478d00 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FinishRaidGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FinishRaidGoal.java
@@ -19,10 +19,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 @RequireVersion(MinecraftVersion.V1_16)
 public class FinishRaidGoal extends SettingGoal {
@@ -50,4 +46,4 @@ public void onRaidFinish(@Nonnull RaidFinishEvent event) {
 		ChallengeAPI.endChallenge(ChallengeEndCause.GOAL_REACHED, event::getWinners);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FirstOneToDieGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FirstOneToDieGoal.java
index 1f01aa691..622a512d9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FirstOneToDieGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/FirstOneToDieGoal.java
@@ -16,10 +16,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class FirstOneToDieGoal extends SettingGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java
index f0ddfbf14..18e3092f6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/GetFullHealthGoal.java
@@ -24,10 +24,6 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 @Since("2.2.0")
 public class GetFullHealthGoal extends SettingModifierGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesGoal.java
index a8b5157c2..02041d067 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesGoal.java
@@ -11,10 +11,6 @@
 import javax.annotation.Nonnull;
 import java.util.Arrays;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class KillAllBossesGoal extends KillMobsGoal {
 
@@ -34,4 +30,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.DIAMOND_SWORD, Message.forName("item-all-bosses-goal"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesNewGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesNewGoal.java
index 62f39ca4a..0d9206315 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesNewGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllBossesNewGoal.java
@@ -13,10 +13,6 @@
 import javax.annotation.Nonnull;
 import java.util.Arrays;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.2.0")
 @RequireVersion(MinecraftVersion.V1_19)
 public class KillAllBossesNewGoal extends KillMobsGoal {
@@ -37,4 +33,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.NETHERITE_SWORD, Message.forName("item-all-bosses-new-goal"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMobsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMobsGoal.java
index 1954cbb65..989e47a8d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMobsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMobsGoal.java
@@ -13,10 +13,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 @Since("2.1.3")
 public class KillAllMobsGoal extends KillMobsGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java
index d1f4096b7..049dd1579 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillAllMonsterGoal.java
@@ -15,10 +15,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 @Since("2.1.3")
 public class KillAllMonsterGoal extends KillMobsGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillElderGuardianGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillElderGuardianGoal.java
index d6ca9b9f8..485f83260 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillElderGuardianGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillElderGuardianGoal.java
@@ -12,10 +12,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class KillElderGuardianGoal extends KillEntityGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillEnderDragonGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillEnderDragonGoal.java
index 382fcc7f4..019320b33 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillEnderDragonGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillEnderDragonGoal.java
@@ -12,10 +12,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class KillEnderDragonGoal extends KillEntityGoal {
 
 	public KillEnderDragonGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillIronGolemGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillIronGolemGoal.java
index cbc79c9c9..377ab6dcd 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillIronGolemGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillIronGolemGoal.java
@@ -12,10 +12,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class KillIronGolemGoal extends KillEntityGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillSnowGolemGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillSnowGolemGoal.java
index cfe230402..8295a2712 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillSnowGolemGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillSnowGolemGoal.java
@@ -11,10 +11,6 @@
 import org.bukkit.Material;
 import org.bukkit.Sound;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class KillSnowGolemGoal extends KillEntityGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWardenGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWardenGoal.java
index ffcd2aae8..68e989ae9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWardenGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWardenGoal.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.2.0")
 @RequireVersion(MinecraftVersion.V1_19)
 public class KillWardenGoal extends KillEntityGoal {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWitherGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWitherGoal.java
index 11ebc2656..258886f2b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWitherGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/KillWitherGoal.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class KillWitherGoal extends KillEntityGoal {
 
 	public KillWitherGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/LastManStandingGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/LastManStandingGoal.java
index fe90a8cff..f4b1afab1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/LastManStandingGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/LastManStandingGoal.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class LastManStandingGoal extends SettingGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MaxHeightGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MaxHeightGoal.java
index 5416f0951..3abeba17c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MaxHeightGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MaxHeightGoal.java
@@ -10,10 +10,6 @@
 import org.bukkit.World.Environment;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Since("2.1.0")
 public class MaxHeightGoal extends FirstPlayerAtHeightGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MinHeightGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MinHeightGoal.java
index 4b0de86e3..fe2ae7e01 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MinHeightGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MinHeightGoal.java
@@ -11,10 +11,6 @@
 import org.bukkit.World.Environment;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Since("2.1.0")
 public class MinHeightGoal extends FirstPlayerAtHeightGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MineMostBlocksGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MineMostBlocksGoal.java
index ec8d2f2f6..df37703b3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MineMostBlocksGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MineMostBlocksGoal.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class MineMostBlocksGoal extends PointsGoal {
 
 	public MineMostBlocksGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostEmeraldsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostEmeraldsGoal.java
index c5be3df63..8cc7975bf 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostEmeraldsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostEmeraldsGoal.java
@@ -18,10 +18,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0.2
- */
 @Since("2.0.2")
 public class MostEmeraldsGoal extends PointsGoal {
 
@@ -84,4 +80,4 @@ public void onUpdate(@Nonnull PlayerDropItemEvent event) {
 		updatePoints(event.getPlayer());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostOresGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostOresGoal.java
index 9852c3409..8d9f1cec1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostOresGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/MostOresGoal.java
@@ -16,10 +16,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 @Since("2.1.1")
 public class MostOresGoal extends PointsGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/RaceGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/RaceGoal.java
index d8d5a3dcb..c773eb0ad 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/RaceGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/RaceGoal.java
@@ -32,10 +32,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Since("2.1.0")
 public class RaceGoal extends SettingModifierGoal {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java
index 56259f23e..164737ee5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ExtremeForceBattleGoal.java
@@ -36,10 +36,6 @@
 import java.util.UUID;
 import java.util.function.Function;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class ExtremeForceBattleGoal extends ForceBattleDisplayGoal<ForceTarget<?>> {
 
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java
index ddb3047f7..ad7364afb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceAdvancementBattleGoal.java
@@ -21,10 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.0
- */
 @Since("2.2.0")
 public class ForceAdvancementBattleGoal extends ForceBattleGoal<AdvancementTarget> {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBiomeBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBiomeBattleGoal.java
index 2bfeca5f5..680cf5fb5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBiomeBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBiomeBattleGoal.java
@@ -17,10 +17,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.1.3
- */
 public class ForceBiomeBattleGoal extends ForceBattleGoal<BiomeTarget> {
 
     public ForceBiomeBattleGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBlockBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBlockBattleGoal.java
index 0916d0227..6b72f552d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBlockBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceBlockBattleGoal.java
@@ -16,10 +16,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.0
- */
 @Since("2.2.0")
 public class ForceBlockBattleGoal extends ForceBattleDisplayGoal<BlockTarget> {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceDamageBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceDamageBattleGoal.java
index c3cb8dd2e..e229b34ea 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceDamageBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceDamageBattleGoal.java
@@ -17,10 +17,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class ForceDamageBattleGoal extends ForceBattleGoal<DamageTarget> {
 
     public ForceDamageBattleGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceHeightBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceHeightBattleGoal.java
index 6a85ad51b..f72bdbf81 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceHeightBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceHeightBattleGoal.java
@@ -16,10 +16,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class ForceHeightBattleGoal extends ForceBattleGoal<HeightTarget> {
 
     public ForceHeightBattleGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceItemBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceItemBattleGoal.java
index b4238e8bd..b74e60a7a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceItemBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceItemBattleGoal.java
@@ -18,10 +18,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 @Since("2.1.3")
 public class ForceItemBattleGoal extends ForceBattleDisplayGoal<ItemTarget> {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceMobBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceMobBattleGoal.java
index 573d0dd91..542f64d5d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceMobBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForceMobBattleGoal.java
@@ -19,10 +19,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.0
- */
 @Since("2.2.0")
 public class ForceMobBattleGoal extends ForceBattleDisplayGoal<MobTarget> {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForcePositionBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForcePositionBattleGoal.java
index 6c2a881f2..a800dbff4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForcePositionBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/ForcePositionBattleGoal.java
@@ -14,10 +14,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class ForcePositionBattleGoal extends ForceBattleGoal<PositionTarget> {
     public ForcePositionBattleGoal() {
         super(Message.forName("menu-force-position-battle-goal-settings"));
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/AdvancementTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/AdvancementTarget.java
index 738269090..62ebf3f97 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/AdvancementTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/AdvancementTarget.java
@@ -10,10 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class AdvancementTarget extends ForceTarget<Advancement> {
 
     public AdvancementTarget(Advancement target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BiomeTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BiomeTarget.java
index 181fa0728..11ba3212e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BiomeTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BiomeTarget.java
@@ -10,10 +10,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class BiomeTarget extends ForceTarget<Biome> {
 
     public BiomeTarget(Biome target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BlockTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BlockTarget.java
index 585c5acb1..1728cbc6c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BlockTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/BlockTarget.java
@@ -13,10 +13,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class BlockTarget extends ForceTarget<Material> {
 
     public BlockTarget(Material target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/DamageTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/DamageTarget.java
index 39ab6581c..2cc448a88 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/DamageTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/DamageTarget.java
@@ -4,10 +4,6 @@
 import net.codingarea.challenges.plugin.content.Message;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class DamageTarget extends ForceTarget<Integer> {
 
     public DamageTarget(Integer target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java
index 8abf1a85b..a04eac918 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ForceTarget.java
@@ -8,10 +8,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public abstract class ForceTarget<T> {
     protected final T target;
 
@@ -48,4 +44,4 @@ public Object getTargetSaveObject() {
         return target.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/HeightTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/HeightTarget.java
index 9abe837f7..30f913054 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/HeightTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/HeightTarget.java
@@ -4,10 +4,6 @@
 import net.codingarea.challenges.plugin.content.Message;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class HeightTarget extends ForceTarget<Integer> {
 
     public HeightTarget(Integer target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ItemTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ItemTarget.java
index a407974ec..c8a6c9ca3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ItemTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/ItemTarget.java
@@ -12,10 +12,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class ItemTarget extends ForceTarget<Material> {
 
     public ItemTarget(Material target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java
index d5ce2cc38..cfe4ed8b8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/MobTarget.java
@@ -16,10 +16,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class MobTarget extends ForceTarget<EntityType> {
 
     public MobTarget(EntityType target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/PositionTarget.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/PositionTarget.java
index 743cf7f16..dae98fc12 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/PositionTarget.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/goal/forcebattle/targets/PositionTarget.java
@@ -8,10 +8,6 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class PositionTarget extends ForceTarget<Tuple<Double, Double>> {
 
     public PositionTarget(double x, double z) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/material/BlockMaterialSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/material/BlockMaterialSetting.java
index 0e0c56653..2305b84e0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/material/BlockMaterialSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/material/BlockMaterialSetting.java
@@ -20,10 +20,6 @@
 import javax.annotation.Nonnull;
 import java.util.Arrays;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class BlockMaterialSetting extends Setting {
 
 	private final String name;
@@ -105,4 +101,4 @@ public String getUniqueName() {
 		return "blockmaterial" + materials[0].name().toLowerCase();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BackpackSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BackpackSetting.java
index 053947fb2..ffbdb9309 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BackpackSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BackpackSetting.java
@@ -27,10 +27,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class BackpackSetting extends SettingModifier implements PlayerCommand {
 
 	public static final int SHARED = 1,
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BastionSpawnSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BastionSpawnSetting.java
index 0cd7cb3a7..afdd615d3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BastionSpawnSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/BastionSpawnSetting.java
@@ -15,10 +15,6 @@
 import java.util.Arrays;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 @RequireVersion(MinecraftVersion.V1_16)
 public class BastionSpawnSetting extends NetherPortalSpawnSetting {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/CutCleanSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/CutCleanSetting.java
index 0ecf32884..ccfd47482 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/CutCleanSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/CutCleanSetting.java
@@ -30,11 +30,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class CutCleanSetting extends MenuSetting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageDisplaySetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageDisplaySetting.java
index cc0969959..43405e86d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageDisplaySetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageDisplaySetting.java
@@ -23,10 +23,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class DamageDisplaySetting extends Setting {
 
 	public DamageDisplaySetting() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageMultiplierModifier.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageMultiplierModifier.java
index cf6675268..bae4e3b93 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageMultiplierModifier.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DamageMultiplierModifier.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class DamageMultiplierModifier extends Modifier {
 
 	public DamageMultiplierModifier() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathMessageSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathMessageSetting.java
index a6f8d4d99..39e646b59 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathMessageSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathMessageSetting.java
@@ -20,10 +20,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class DeathMessageSetting extends Modifier {
 
 	public static final int ENABLED = 2,
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathPositionSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathPositionSetting.java
index 1736b6ba7..19337ecd6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathPositionSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DeathPositionSetting.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class DeathPositionSetting extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DifficultySetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DifficultySetting.java
index aeb0167f5..0ae530df8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DifficultySetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/DifficultySetting.java
@@ -30,11 +30,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class DifficultySetting extends Modifier implements SenderCommand, TabCompleter {
 
 	public DifficultySetting() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/EnderChestCommandSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/EnderChestCommandSetting.java
index e097f9b83..80a8c9ef7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/EnderChestCommandSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/EnderChestCommandSetting.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class EnderChestCommandSetting extends Setting implements PlayerCommand {
 
@@ -41,4 +37,4 @@ public void onCommand(@Nonnull Player player, @Nonnull String[] args) throws Exc
 		Message.forName("command-enderchest-open").send(player, Prefix.CHALLENGES);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/FortressSpawnSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/FortressSpawnSetting.java
index 13ff7c093..846d5f120 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/FortressSpawnSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/FortressSpawnSetting.java
@@ -10,10 +10,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class FortressSpawnSetting extends NetherPortalSpawnSetting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java
index 8be845fba..dadd0c9e9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/HealthDisplaySetting.java
@@ -21,10 +21,6 @@
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.ScoreboardManager;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class HealthDisplaySetting extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/ImmediateRespawnSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/ImmediateRespawnSetting.java
index 2c9a9ab8b..e050cbcb2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/ImmediateRespawnSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/ImmediateRespawnSetting.java
@@ -15,10 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class ImmediateRespawnSetting extends Setting {
 
@@ -69,4 +65,4 @@ public void onPlayerDeath(@Nonnull PlayerDeathEvent event) {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/KeepInventorySetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/KeepInventorySetting.java
index 1f48a805a..3bb1c7b54 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/KeepInventorySetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/KeepInventorySetting.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class KeepInventorySetting extends Setting {
 
 	public KeepInventorySetting() {
@@ -40,4 +36,4 @@ protected void onDisable() {
 			world.setGameRule(GameRule.KEEP_INVENTORY, false);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java
index 1275caf10..4f385dc6e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/MaxHealthSetting.java
@@ -19,10 +19,6 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class MaxHealthSetting extends Modifier {
 
 	/**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHitDelaySetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHitDelaySetting.java
index 627e53494..f74da9f48 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHitDelaySetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHitDelaySetting.java
@@ -14,10 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class NoHitDelaySetting extends Setting {
 
 	public NoHitDelaySetting() {
@@ -39,4 +35,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.FEATHER, Message.forName("item-no-hit-delay-setting"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHungerSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHungerSetting.java
index 077646b53..a3a5ef966 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHungerSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoHungerSetting.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class NoHungerSetting extends Setting {
 
 	public NoHungerSetting() {
@@ -45,4 +41,4 @@ private void feedPlayer(@Nonnull Player player) {
 		player.setSaturation(20);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoItemDamageSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoItemDamageSetting.java
index 4573cbafd..0a7565208 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoItemDamageSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoItemDamageSetting.java
@@ -10,10 +10,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class NoItemDamageSetting extends Setting {
 
 	public NoItemDamageSetting() {
@@ -35,4 +31,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.ANVIL, Message.forName("item-no-item-damage-setting"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoOffhandSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoOffhandSetting.java
index f1a3caf24..66e998142 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoOffhandSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/NoOffhandSetting.java
@@ -17,10 +17,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class NoOffhandSetting extends Setting {
 
@@ -64,4 +60,4 @@ public void onInventoryClick(InventoryClickEvent event) {
 		event.setCancelled(true);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java
index 812befd74..bb6fc9525 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OldPvPSetting.java
@@ -20,10 +20,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Since("2.0")
 public class OldPvPSetting extends Setting {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OneTeamLifeSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OneTeamLifeSetting.java
index f306b11a7..8ab6ef1a2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OneTeamLifeSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/OneTeamLifeSetting.java
@@ -15,10 +15,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class OneTeamLifeSetting extends Setting {
 
 	private boolean isKilling = false;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PlayerGlowSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PlayerGlowSetting.java
index 1dea9c84c..cc8fbad1f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PlayerGlowSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PlayerGlowSetting.java
@@ -16,10 +16,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class PlayerGlowSetting extends Setting {
 
 	public PlayerGlowSetting() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PositionSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PositionSetting.java
index 78a4b5c5b..f9c8b9cd3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PositionSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PositionSetting.java
@@ -29,10 +29,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class PositionSetting extends Setting implements PlayerCommand, TabCompleter {
 
 	private final Map<String, Location> positions = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PregameMovementSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PregameMovementSetting.java
index 4e0df21f4..2c6a9e9db 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PregameMovementSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PregameMovementSetting.java
@@ -14,11 +14,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class PregameMovementSetting extends Setting {
 
 	public PregameMovementSetting() {
@@ -59,4 +54,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.PISTON, Message.forName("pregame-movement-setting"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PvPSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PvPSetting.java
index c317e1e7b..2a6180473 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PvPSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/PvPSetting.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class PvPSetting extends Setting {
 
 	public PvPSetting() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RegenerationSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RegenerationSetting.java
index 0625540a5..7402eb235 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RegenerationSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RegenerationSetting.java
@@ -17,10 +17,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class RegenerationSetting extends Modifier {
 
 	public RegenerationSetting() {
@@ -72,4 +68,4 @@ public void onEntityRegainHealth(EntityRegainHealthEvent event) {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RespawnSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RespawnSetting.java
index fa4fd7d3f..b2c320340 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RespawnSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/RespawnSetting.java
@@ -22,10 +22,6 @@
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class RespawnSetting extends Setting {
 
 	private final Map<Player, Location> locationsBeforeRespawn = new ConcurrentHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SlotLimitSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SlotLimitSetting.java
index 88c66b02d..9d60a6687 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SlotLimitSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SlotLimitSetting.java
@@ -25,10 +25,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class SlotLimitSetting extends Modifier {
 
@@ -163,4 +159,4 @@ public void onPlayerIgnoreStatusChange(PlayerIgnoreStatusChangeEvent event) {
 		});
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SoupSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SoupSetting.java
index ab5ea73de..0ecda9701 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SoupSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SoupSetting.java
@@ -15,10 +15,6 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.potion.PotionEffect;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class SoupSetting extends Setting {
 
 	public SoupSetting() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SplitHealthSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SplitHealthSetting.java
index a12386d82..9f9c4669e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SplitHealthSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/SplitHealthSetting.java
@@ -21,10 +21,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class SplitHealthSetting extends Setting {
 
 	public SplitHealthSetting() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java
index 3fa3c49ac..9b0a4e1d4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TimberSetting.java
@@ -22,11 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class TimberSetting extends SettingModifier {
 
 	public static final int LOGS_LEAVES = 2;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TopCommandSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TopCommandSetting.java
index 3f3e08384..9483e70a1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TopCommandSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TopCommandSetting.java
@@ -16,10 +16,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class TopCommandSetting extends Setting implements PlayerCommand {
 
 	public TopCommandSetting() {
@@ -76,4 +72,4 @@ public ItemBuilder createDisplayItem() {
 		return new ItemBuilder(Material.MAGENTA_GLAZED_TERRACOTTA, Message.forName("top-command-setting"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TotemSaveDeathSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TotemSaveDeathSetting.java
index bd0739af2..f441a1429 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TotemSaveDeathSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/implementation/setting/TotemSaveDeathSetting.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Since("2.0")
 public class TotemSaveDeathSetting extends Setting {
 
@@ -37,4 +33,4 @@ public void onEntityResurrect(@Nonnull EntityResurrectEvent event) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/EmptyChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/EmptyChallenge.java
index 143f6e1d0..a2ae004e7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/EmptyChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/EmptyChallenge.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class EmptyChallenge implements IChallenge {
 
 	private final MenuType menuType;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IChallenge.java
index 2492c1023..7679a2c08 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IChallenge.java
@@ -11,11 +11,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @see ChallengeManager
- * @since 2.0
- */
 public interface IChallenge extends GamestateSaveable {
 
 	/**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IGoal.java
index 455333bd4..66d438d2d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IGoal.java
@@ -10,11 +10,6 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @see ChallengeManager
- * @since 2.0
- */
 public interface IGoal extends IChallenge {
 
 	/**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IModifier.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IModifier.java
index ee15e6ef5..928f4c13c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IModifier.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/IModifier.java
@@ -2,10 +2,6 @@
 
 import javax.annotation.Nonnegative;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public interface IModifier {
 
 	@Nonnegative
@@ -21,4 +17,4 @@ public interface IModifier {
 
 	void playValueChangeTitle();
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractChallenge.java
index 3fcaeff27..ca222f168 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractChallenge.java
@@ -28,11 +28,6 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public abstract class AbstractChallenge implements IChallenge, Listener {
 
 	protected static final Challenges plugin = Challenges.getInstance();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java
index a1e9fbf67..f0c68f3fe 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/AbstractForceChallenge.java
@@ -10,10 +10,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class AbstractForceChallenge extends TimedChallenge {
 
 	public static final int WAITING = 0,
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java
index 860fa45ec..c43553aa2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CollectionGoal.java
@@ -15,10 +15,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class CollectionGoal extends SettingGoal {
 
 	private final Map<UUID, List<String>> collections = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CompletableForceChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CompletableForceChallenge.java
index 8e9f186e6..3ed7971dd 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CompletableForceChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/CompletableForceChallenge.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class CompletableForceChallenge extends AbstractForceChallenge {
 
 	public CompletableForceChallenge(@Nonnull MenuType menu) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java
index b9ba6efe5..163fce396 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/EndingForceChallenge.java
@@ -11,10 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class EndingForceChallenge extends AbstractForceChallenge {
 
 	public EndingForceChallenge(@Nonnull MenuType menu) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FindItemGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FindItemGoal.java
index 33be66503..92e48a424 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FindItemGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FindItemGoal.java
@@ -15,10 +15,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class FindItemGoal extends SettingGoal {
 
 	private final Material searchedItem;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java
index 035c06449..463dd0ee2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/FirstPlayerAtHeightGoal.java
@@ -14,10 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class FirstPlayerAtHeightGoal extends SettingGoal {
 
 	private int heightToGetTo;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java
index deb6b7486..a2e199a58 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleDisplayGoal.java
@@ -18,10 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.0
- */
 public abstract class ForceBattleDisplayGoal<T extends ForceTarget<?>> extends ForceBattleGoal<T> {
 
     private Map<Player, ArmorStand> displayStands;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleGoal.java
index 8583464c3..d12c792b7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ForceBattleGoal.java
@@ -37,10 +37,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.0
- */
 public abstract class ForceBattleGoal<T extends ForceTarget<?>> extends MenuGoal {
 
 	protected final Map<UUID, Integer> jokerUsed = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/HydraChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/HydraChallenge.java
index 80884d628..04b5d1838 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/HydraChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/HydraChallenge.java
@@ -13,10 +13,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public abstract class HydraChallenge extends Setting {
 
 	public HydraChallenge(@Nonnull MenuType menu) {
@@ -44,4 +40,4 @@ public void onEntityDamageByEntity(@Nonnull EntityDeathByPlayerEvent event) {
 			MinecraftNameWrapper.ENTITY_EFFECT, 2, 17, 1);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ItemCollectionGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ItemCollectionGoal.java
index f2a2a8348..95faee5b8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ItemCollectionGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ItemCollectionGoal.java
@@ -16,10 +16,6 @@
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicInteger;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public abstract class ItemCollectionGoal extends CollectionGoal {
 
 	public ItemCollectionGoal(@NotNull Material... target) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillEntityGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillEntityGoal.java
index 8c1135858..218a068fe 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillEntityGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillEntityGoal.java
@@ -14,10 +14,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class KillEntityGoal extends SettingGoal {
 
 	protected final EntityType entity;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillMobsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillMobsGoal.java
index 1d58fd1bb..8cd2371a7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillMobsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/KillMobsGoal.java
@@ -17,10 +17,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 public abstract class KillMobsGoal extends SettingGoal {
 
 	protected static List<EntityType> entitiesKilled;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuGoal.java
index 2a4d0e6ed..cf18fb51d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuGoal.java
@@ -10,10 +10,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.1.4
- */
 public abstract class MenuGoal extends MenuSetting implements IGoal {
 	public MenuGoal(@NotNull MenuType menu, @NotNull Message title) {
 		super(menu, title);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuSetting.java
index 97b1684fe..4b7427825 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/MenuSetting.java
@@ -29,10 +29,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class MenuSetting extends Setting {
 
 	private final Map<String, SubSetting> settings = new LinkedHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Modifier.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Modifier.java
index ccb223b00..a9091053d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Modifier.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Modifier.java
@@ -12,10 +12,6 @@
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public abstract class Modifier extends AbstractChallenge implements IModifier {
 
 	private final int max, min;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java
index 6d5bd4ffd..0818c892d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/ModifierCollectionGoal.java
@@ -11,10 +11,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public abstract class ModifierCollectionGoal extends CollectionGoal implements IModifier {
 
 	private final int max, min;
@@ -118,4 +114,4 @@ public void writeSettings(@Nonnull Document document) {
 		document.set("value", value);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/NetherPortalSpawnSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/NetherPortalSpawnSetting.java
index 79303c354..a10551f4e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/NetherPortalSpawnSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/NetherPortalSpawnSetting.java
@@ -18,11 +18,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public abstract class NetherPortalSpawnSetting extends OneEnabledSetting {
 
 	private static final String id = "netherportal_handle";
@@ -200,4 +195,4 @@ public void writeGameState(@Nonnull Document document) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/OneEnabledSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/OneEnabledSetting.java
index f8a0e3117..ebd7ba918 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/OneEnabledSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/OneEnabledSetting.java
@@ -5,10 +5,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class OneEnabledSetting extends Setting {
 
 	private final String typeId;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/PointsGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/PointsGoal.java
index b9b21cf94..2ee5d22f0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/PointsGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/PointsGoal.java
@@ -13,10 +13,6 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class PointsGoal extends SettingGoal {
 
 	private final Map<UUID, Integer> points = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/RandomizerSetting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/RandomizerSetting.java
index 332a9eb59..3c9b8ebb6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/RandomizerSetting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/RandomizerSetting.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class RandomizerSetting extends Setting {
 
 	protected IRandom random = IRandom.create();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Setting.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Setting.java
index 0662c6c36..0f74a1501 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Setting.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/Setting.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 
 public abstract class Setting extends AbstractChallenge {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingGoal.java
index 1893f2868..606ddb68d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingGoal.java
@@ -8,10 +8,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class SettingGoal extends Setting implements IGoal {
 
 	public SettingGoal() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifier.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifier.java
index 3e9195f2a..644839adc 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifier.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifier.java
@@ -11,10 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class SettingModifier extends Modifier {
 
 	private boolean enabled;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierCollectionGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierCollectionGoal.java
index ae202aa1e..69234f1c6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierCollectionGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierCollectionGoal.java
@@ -9,10 +9,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public abstract class SettingModifierCollectionGoal extends ModifierCollectionGoal {
 
 	public SettingModifierCollectionGoal(int min, int max, @Nonnull Object... target) {
@@ -76,4 +72,4 @@ public void loadSettings(@Nonnull Document document) {
 		setEnabled(document.getBoolean("enabled"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierGoal.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierGoal.java
index 15e6aa98e..66935584f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierGoal.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/SettingModifierGoal.java
@@ -10,10 +10,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class SettingModifierGoal extends SettingModifier implements IGoal {
 
 	public SettingModifierGoal(@Nonnull MenuType menu) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/TimedChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/TimedChallenge.java
index 7ad17ae2b..7cf353a96 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/TimedChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/TimedChallenge.java
@@ -11,10 +11,6 @@
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class TimedChallenge extends SettingModifier {
 
 	private final boolean runAsync;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/WorldDependentChallenge.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/WorldDependentChallenge.java
index 2321efc47..a826eb11f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/WorldDependentChallenge.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/abstraction/WorldDependentChallenge.java
@@ -20,10 +20,6 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class WorldDependentChallenge extends TimedChallenge {
 
 	private boolean inExtraWorld;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeConfigHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeConfigHelper.java
index 0aa14399a..e17817559 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeConfigHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeConfigHelper.java
@@ -6,10 +6,6 @@
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public final class ChallengeConfigHelper {
 
 	private static final Document settingsDocument;
@@ -27,4 +23,4 @@ public static Document getSettingsDocument() {
 		return settingsDocument;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeHelper.java
index f25548b8e..eaf6715c9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/ChallengeHelper.java
@@ -34,11 +34,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public final class ChallengeHelper {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java
index b2d7105e2..f4253a197 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/GoalHelper.java
@@ -21,10 +21,6 @@
 import java.util.function.Supplier;
 import java.util.function.ToIntBiFunction;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class GoalHelper {
 
 	public static final int LEADERBOARD_SIZE = 9;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/SubSettingsHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/SubSettingsHelper.java
index f8390f8db..4e10f6821 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/SubSettingsHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/challenges/type/helper/SubSettingsHelper.java
@@ -17,10 +17,6 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.potion.PotionEffectType;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.1
- */
 public class SubSettingsHelper {
 
 	public static final String
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/ItemDescription.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/ItemDescription.java
index 4e0b2018a..803440ff4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/ItemDescription.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/ItemDescription.java
@@ -10,10 +10,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ItemDescription {
 
 	private static final Document config = Challenges.getInstance().getConfigDocument().getDocument("design");
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/Message.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/Message.java
index 45de793ce..302c0af39 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/Message.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/Message.java
@@ -13,10 +13,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public interface Message {
 
 	String NULL = "§r§fN/A";
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/Prefix.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/Prefix.java
index 0995acc77..3ab88d5e1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/Prefix.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/Prefix.java
@@ -8,10 +8,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.2
- */
 public class Prefix {
 
 	private static final Map<String, Prefix> values = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageImpl.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageImpl.java
index 3056fb22e..c4cdd53e9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageImpl.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageImpl.java
@@ -22,10 +22,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class MessageImpl implements Message {
 
 	protected final String name;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageManager.java
index 95986bfbf..80bf53e2e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/impl/MessageManager.java
@@ -7,10 +7,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class MessageManager {
 
 	private static final Map<String, Message> cache = new ConcurrentHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/ContentLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/ContentLoader.java
index 2c7e3f422..97aa23441 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/ContentLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/ContentLoader.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.io.File;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class ContentLoader {
 
 	@Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java
index dbfad9f25..d963b49a5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LanguageLoader.java
@@ -19,10 +19,6 @@
 import java.io.IOException;
 import java.util.Map.Entry;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class LanguageLoader extends ContentLoader {
 
 	public static final String DEFAULT_LANGUAGE = "en";
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LoaderRegistry.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LoaderRegistry.java
index 4cf96e944..c93ebe49a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LoaderRegistry.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/LoaderRegistry.java
@@ -8,10 +8,6 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class LoaderRegistry {
 
 	private static final AtomicInteger loading = new AtomicInteger(); // Keeps track of how many loaders are still loading
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/PrefixLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/PrefixLoader.java
index bdd9124f9..012ef9408 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/PrefixLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/PrefixLoader.java
@@ -7,10 +7,6 @@
 
 import java.io.File;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class PrefixLoader extends ContentLoader {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java
index 01b08a662..89efdf0a1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/content/loader/UpdateLoader.java
@@ -8,10 +8,6 @@
 
 import java.net.URL;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class UpdateLoader extends ContentLoader {
 
 	public static final int RESOURCE_ID = 80548;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/blocks/BlockDropManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/blocks/BlockDropManager.java
index 26baedf27..fcc6ca530 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/blocks/BlockDropManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/blocks/BlockDropManager.java
@@ -15,10 +15,6 @@
 import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class BlockDropManager {
 
 	private final Map<Material, RegisteredDrops> drops = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/bstats/MetricsLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/bstats/MetricsLoader.java
index 4c7223d50..196905805 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/bstats/MetricsLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/bstats/MetricsLoader.java
@@ -11,10 +11,6 @@
 
 import java.util.HashMap;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class MetricsLoader {
 
 	public void start() {
@@ -44,4 +40,4 @@ private int getMemory() {
 		return MemoryConverter.getGB(Runtime.getRuntime().maxMemory());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeLoader.java
index 00c967b31..9d46c150a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeLoader.java
@@ -93,11 +93,6 @@
 
 /**
  * This class loads all challenges of this plugin.
- * In pre2 versions, this class was known as PluginChallengeLoader.
- *
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
  */
 public final class ChallengeLoader extends ModuleChallengeLoader {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeManager.java
index f9a972891..661d9cfa1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ChallengeManager.java
@@ -22,10 +22,6 @@
 import java.util.List;
 import java.util.function.Predicate;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ChallengeManager {
 
 	private final List<IChallenge> challenges = new LinkedList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java
index 976d2f181..669a3bbe5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/CustomChallengesLoader.java
@@ -16,10 +16,6 @@
 import javax.annotation.Nonnull;
 import java.util.*;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1
- */
 public class CustomChallengesLoader extends ModuleChallengeLoader {
 
 	private final Map<UUID, CustomChallenge> customChallenges = new LinkedHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ModuleChallengeLoader.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ModuleChallengeLoader.java
index d43232af7..d5b098432 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ModuleChallengeLoader.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/ModuleChallengeLoader.java
@@ -19,10 +19,6 @@
 import java.lang.reflect.Constructor;
 import java.util.Optional;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class ModuleChallengeLoader {
 
 	protected final BukkitModule plugin;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/CanInstaKillOnEnable.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/CanInstaKillOnEnable.java
index c3a747521..b6c11153c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/CanInstaKillOnEnable.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/CanInstaKillOnEnable.java
@@ -5,10 +5,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CanInstaKillOnEnable {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/ExcludeFromRandomChallenges.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/ExcludeFromRandomChallenges.java
index 23aae2577..3db378b57 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/ExcludeFromRandomChallenges.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/ExcludeFromRandomChallenges.java
@@ -5,10 +5,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExcludeFromRandomChallenges {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/RequireVersion.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/RequireVersion.java
index 4d8666d86..67734ab3e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/RequireVersion.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/annotations/RequireVersion.java
@@ -8,10 +8,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface RequireVersion {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/entities/GamestateSaveable.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/entities/GamestateSaveable.java
index 4b8744b74..89a79d854 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/entities/GamestateSaveable.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/challenges/entities/GamestateSaveable.java
@@ -4,10 +4,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public interface GamestateSaveable {
 
 	String getUniqueGamestateName();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupport.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupport.java
index cf2806cfc..c77f80de4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupport.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupport.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public interface CloudSupport {
 
 	@Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupportManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupportManager.java
index 3066c6324..e5fa7d45c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupportManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/CloudSupportManager.java
@@ -21,10 +21,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class CloudSupportManager implements Listener {
 
 	private final Map<UUID, String> cachedColoredNames = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet2Support.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet2Support.java
index 6c1cfa1a0..2aa437518 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet2Support.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet2Support.java
@@ -11,10 +11,6 @@
 import javax.annotation.Nonnull;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class CloudNet2Support implements CloudSupport {
 
 	@Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet3Support.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet3Support.java
index 1b96086b8..c3f9e2a0b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet3Support.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/cloud/support/CloudNet3Support.java
@@ -12,10 +12,6 @@
 import javax.annotation.Nonnull;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class CloudNet3Support implements CloudSupport {
 
 	@Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/database/DatabaseManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/database/DatabaseManager.java
index d061a9da7..356dcc2eb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/database/DatabaseManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/database/DatabaseManager.java
@@ -24,10 +24,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class DatabaseManager {
 
 	private final Map<String, Tuple<String, JavaPlugin>> registry = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/files/ConfigManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/files/ConfigManager.java
index 09b2cccd5..48580b8c6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/files/ConfigManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/files/ConfigManager.java
@@ -17,10 +17,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public final class ConfigManager {
 
 	private final List<String> missingConfigSettings;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/inventory/PlayerInventoryManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/inventory/PlayerInventoryManager.java
index 7ffdeb017..9ded8cf2a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/inventory/PlayerInventoryManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/inventory/PlayerInventoryManager.java
@@ -29,10 +29,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class PlayerInventoryManager implements Listener {
 
 	private final List<HotbarItem> hotbarItems;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java
index 2a5128579..6e12c0c48 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/InventoryTitleManager.java
@@ -4,10 +4,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class InventoryTitleManager {
 
 	private InventoryTitleManager() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuManager.java
index 8ba82108f..9ddc48971 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuManager.java
@@ -19,10 +19,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class MenuManager {
 
 	public static final String MANAGE_GUI_PERMISSION = "challenges.manage";
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuType.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuType.java
index 704e544c5..cacd68a2e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuType.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/MenuType.java
@@ -14,10 +14,7 @@
 import javax.annotation.Nonnull;
 import java.util.function.Consumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
+
 public enum MenuType {
 
 	TIMER("timer", Material.CLOCK, new TimerMenuGenerator(), false),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java
index 2faa5a257..764580be4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChallengeMenuGenerator.java
@@ -24,10 +24,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ChallengeMenuGenerator extends MultiPageMenuGenerator {
 
 	protected final List<IChallenge> challenges = new LinkedList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseItemGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseItemGenerator.java
index 0f4ad6e67..08222a111 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseItemGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseItemGenerator.java
@@ -16,10 +16,6 @@
 import javax.annotation.Nonnull;
 import java.util.LinkedHashMap;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ChooseItemGenerator extends MultiPageMenuGenerator {
 
 	private final LinkedHashMap<String, ItemStack> items;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseMultipleItemGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseMultipleItemGenerator.java
index 99ef204a9..24ae44c25 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseMultipleItemGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ChooseMultipleItemGenerator.java
@@ -22,10 +22,6 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class ChooseMultipleItemGenerator extends MultiPageMenuGenerator {
 
 	public static final int FINISH_SLOT = 40;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java
index e112dea0f..fd7122c59 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MenuGenerator.java
@@ -12,10 +12,6 @@
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class MenuGenerator {
 
 	private MenuType menuType;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MultiPageMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MultiPageMenuGenerator.java
index 60898ed8d..971853af9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MultiPageMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/MultiPageMenuGenerator.java
@@ -14,10 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public abstract class MultiPageMenuGenerator extends MenuGenerator {
 
 	protected final List<Inventory> inventories = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ValueMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ValueMenuGenerator.java
index 05ccc2f9d..8106fdf87 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ValueMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/ValueMenuGenerator.java
@@ -18,10 +18,6 @@
 import javax.annotation.Nonnull;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 @Getter
 public abstract class ValueMenuGenerator extends MultiPageMenuGenerator {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/CategorisedMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/CategorisedMenuGenerator.java
index 1541f1070..20291244b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/CategorisedMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/CategorisedMenuGenerator.java
@@ -20,10 +20,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 public class CategorisedMenuGenerator extends SettingsMenuGenerator {
 
 	private final Map<SettingCategory, CategorisedSettingsMenuGenerator> categories = new LinkedHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java
index 87b064286..da3145a09 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SettingCategory.java
@@ -7,10 +7,6 @@
 
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 public class SettingCategory {
 
 	//Challenges
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SmallCategorisedMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SmallCategorisedMenuGenerator.java
index b8b9b81bd..4d8f2212f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SmallCategorisedMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/categorised/SmallCategorisedMenuGenerator.java
@@ -1,9 +1,5 @@
 package net.codingarea.challenges.plugin.management.menu.generator.categorised;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 public class SmallCategorisedMenuGenerator extends CategorisedMenuGenerator {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/SettingsMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/SettingsMenuGenerator.java
index 13404457a..697f88629 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/SettingsMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/SettingsMenuGenerator.java
@@ -7,10 +7,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class SettingsMenuGenerator extends ChallengeMenuGenerator {
 
 	public static final int[] SLOTS = {10, 11, 12, 13, 14, 15, 16};
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/TimerMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/TimerMenuGenerator.java
index 3aeaaca2c..ce6d290fa 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/TimerMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/TimerMenuGenerator.java
@@ -29,10 +29,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class TimerMenuGenerator extends MenuGenerator {
 
 	public static final int SIZE = 5 * 9;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java
index 1daee6263..a12cccb13 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/CustomMainSettingsMenuGenerator.java
@@ -14,10 +14,6 @@
 import java.util.Map;
 import java.util.function.Function;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1
- */
 public class CustomMainSettingsMenuGenerator extends ChooseItemGenerator implements IParentCustomGenerator {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/IParentCustomGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/IParentCustomGenerator.java
index 30b47968b..279db1727 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/IParentCustomGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/IParentCustomGenerator.java
@@ -5,10 +5,6 @@
 
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public interface IParentCustomGenerator {
 
 	/**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java
index 44cff4691..7b7bab270 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/InfoMenuGenerator.java
@@ -34,10 +34,6 @@
 import javax.annotation.Nonnull;
 import java.util.*;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @ToString
 public class InfoMenuGenerator extends MenuGenerator implements IParentCustomGenerator {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java
index 83da67ff0..73a020dd5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MainCustomMenuGenerator.java
@@ -17,10 +17,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class MainCustomMenuGenerator extends ChallengeMenuGenerator {
 
 	public static final int[] SLOTS = {10, 11, 12, 13, 14, 15, 16};
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MaterialMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MaterialMenuGenerator.java
index ed35c3120..c142e632f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MaterialMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/MaterialMenuGenerator.java
@@ -11,10 +11,6 @@
 
 import java.util.LinkedHashMap;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class MaterialMenuGenerator extends ChooseItemGenerator {
 
 	private final IParentCustomGenerator parent;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMenuGenerator.java
index 90d9fa22e..dff2ba522 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMenuGenerator.java
@@ -7,10 +7,6 @@
 
 import java.util.LinkedHashMap;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class SubSettingChooseMenuGenerator extends ChooseItemGenerator {
 
 	private final IParentCustomGenerator parent;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMultipleMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMultipleMenuGenerator.java
index 718804f12..8dbf921d4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMultipleMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingChooseMultipleMenuGenerator.java
@@ -7,10 +7,6 @@
 
 import java.util.LinkedHashMap;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class SubSettingChooseMultipleMenuGenerator extends ChooseMultipleItemGenerator {
 
 	private final IParentCustomGenerator parent;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingValueMenuGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingValueMenuGenerator.java
index 99620a15a..ea7d84c44 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingValueMenuGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/generator/implementation/custom/SubSettingValueMenuGenerator.java
@@ -8,10 +8,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class SubSettingValueMenuGenerator extends ValueMenuGenerator {
 
 	private final IParentCustomGenerator parent;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java
index b6ac0ff2d..a37bae7c4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/info/ChallengeMenuClickInfo.java
@@ -8,10 +8,6 @@
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @ToString
 public class ChallengeMenuClickInfo extends MenuClickInfo {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/position/GeneratorMenuPosition.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/position/GeneratorMenuPosition.java
index 28142d975..86acca2c0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/position/GeneratorMenuPosition.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/menu/position/GeneratorMenuPosition.java
@@ -4,10 +4,6 @@
 import net.anweisen.utilities.bukkit.utils.menu.MenuPosition;
 import net.codingarea.challenges.plugin.management.menu.generator.MenuGenerator;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 @Getter
 public abstract class GeneratorMenuPosition implements MenuPosition {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java
index 04d86d139..be1e86430 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskConfig.java
@@ -1,9 +1,5 @@
 package net.codingarea.challenges.plugin.management.scheduler;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class AbstractTaskConfig {
 
 	protected final boolean async;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskExecutor.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskExecutor.java
index 782750a1b..0ed16c4f0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskExecutor.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/AbstractTaskExecutor.java
@@ -7,10 +7,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public abstract class AbstractTaskExecutor implements Runnable {
 
 	protected final List<ScheduledFunction> functions = new ArrayList<>(1);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/PoliciesContainer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/PoliciesContainer.java
index ce7e033df..e28f4c0f6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/PoliciesContainer.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/PoliciesContainer.java
@@ -9,10 +9,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class PoliciesContainer {
 
 	private final List<IPolicy> policies = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduleManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduleManager.java
index 4a2d455e2..de7305d1d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduleManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduleManager.java
@@ -11,10 +11,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ScheduleManager {
 
 	private final Map<ScheduledTaskConfig, ScheduledTaskExecutor> scheduledTaskExecutorsByConfig = new ConcurrentHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledFunction.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledFunction.java
index c8d76f259..5881e556c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledFunction.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledFunction.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import lombok.EqualsAndHashCode;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @EqualsAndHashCode
 public final class ScheduledFunction {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskConfig.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskConfig.java
index 1a2b8d454..0af70ab3e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskConfig.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskConfig.java
@@ -6,10 +6,6 @@
 import lombok.Getter;
 import net.codingarea.challenges.plugin.management.scheduler.task.ScheduledTask;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Getter
 @EqualsAndHashCode(callSuper = false)
 public final class ScheduledTaskConfig extends AbstractTaskConfig {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskExecutor.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskExecutor.java
index 296aca5e6..97d295ddb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskExecutor.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/ScheduledTaskExecutor.java
@@ -7,11 +7,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @see ScheduleManager
- * @since 2.0
- */
 final class ScheduledTaskExecutor extends AbstractTaskExecutor {
 
 	private final ScheduledTaskConfig config;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskConfig.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskConfig.java
index c6b7a2af8..7460bd972 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskConfig.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskConfig.java
@@ -6,10 +6,6 @@
 import javax.annotation.Nonnull;
 import java.util.Arrays;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class TimerTaskConfig extends AbstractTaskConfig {
 
 	private final TimerStatus[] status;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskExecutor.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskExecutor.java
index c3e1ffde1..854d8b41d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskExecutor.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/TimerTaskExecutor.java
@@ -5,10 +5,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 final class TimerTaskExecutor extends AbstractTaskExecutor {
 
 	private final TimerTaskConfig config;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ChallengeStatusPolicy.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ChallengeStatusPolicy.java
index 44a127d36..a39cf8479 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ChallengeStatusPolicy.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ChallengeStatusPolicy.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.Predicate;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum ChallengeStatusPolicy implements IPolicy {
 
 	ALWAYS(challenge -> true),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ExtraWorldPolicy.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ExtraWorldPolicy.java
index 164850658..6b62fa74d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ExtraWorldPolicy.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/ExtraWorldPolicy.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.BooleanSupplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum ExtraWorldPolicy implements IPolicy {
 
 	ALWAYS(() -> true),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/FreshnessPolicy.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/FreshnessPolicy.java
index da57d60d3..22f223d38 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/FreshnessPolicy.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/FreshnessPolicy.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.BooleanSupplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum FreshnessPolicy implements IPolicy {
 
 	ALWAYS(() -> true),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/IPolicy.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/IPolicy.java
index 6c39a8916..300612cbe 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/IPolicy.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/IPolicy.java
@@ -2,10 +2,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public interface IPolicy {
 
 	boolean check(@Nonnull Object holder);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/PlayerCountPolicy.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/PlayerCountPolicy.java
index bcb29fd05..36b206be3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/PlayerCountPolicy.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/PlayerCountPolicy.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.BiPredicate;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum PlayerCountPolicy implements IPolicy {
 
 	ALWAYS((online, max) -> true),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/TimerPolicy.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/TimerPolicy.java
index b4b578e91..1a31428b9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/TimerPolicy.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/policy/TimerPolicy.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.BooleanSupplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum TimerPolicy implements IPolicy {
 
 	ALWAYS(() -> true),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/ScheduledTask.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/ScheduledTask.java
index eb72dc55e..5b44e293c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/ScheduledTask.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/ScheduledTask.java
@@ -9,10 +9,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ScheduledTask {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/TimerTask.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/TimerTask.java
index bc63d36f3..cf8ba7870 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/TimerTask.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/task/TimerTask.java
@@ -12,10 +12,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TimerTask {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java
index b8790babd..b34dcc313 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/ChallengeTimer.java
@@ -25,10 +25,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public final class ChallengeTimer {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerFormat.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerFormat.java
index f2e53215b..3bc78d9e0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerFormat.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerFormat.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class TimerFormat {
 
 	private final String seconds, minutes, hours, day, days;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerStatus.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerStatus.java
index 25a62ddc7..1e2406fb9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerStatus.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/scheduler/timer/TimerStatus.java
@@ -1,9 +1,5 @@
 package net.codingarea.challenges.plugin.management.scheduler.timer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum TimerStatus {
 
 	RUNNING,
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ChallengeEndCause.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ChallengeEndCause.java
index 1202f3693..4fa74dacf 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ChallengeEndCause.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ChallengeEndCause.java
@@ -5,10 +5,6 @@
 import lombok.Getter;
 import net.codingarea.challenges.plugin.content.Message;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 @Getter
 public enum ChallengeEndCause {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GameWorldStorage.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GameWorldStorage.java
index 398035789..80e0bf35d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GameWorldStorage.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GameWorldStorage.java
@@ -17,10 +17,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class GameWorldStorage implements GamestateSaveable {
 
 	private final List<World> worlds = new LinkedList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GeneratorWorldPortalManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GeneratorWorldPortalManager.java
index 08320b295..e274b348d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GeneratorWorldPortalManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/GeneratorWorldPortalManager.java
@@ -16,9 +16,6 @@
 
 /**
  * Manages the portal locations of custom worlds
- *
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
  */
 public class GeneratorWorldPortalManager implements GamestateSaveable {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ScoreboardManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ScoreboardManager.java
index 593438834..e2eb84f9e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ScoreboardManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ScoreboardManager.java
@@ -15,10 +15,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ScoreboardManager {
 
 	private final List<ChallengeBossBar> bossbars = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java
index 8fff31d40..a876c4ad0 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/ServerManager.java
@@ -23,10 +23,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public final class ServerManager {
 
 	private final boolean setSpectatorOnWin;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java
index 54e8bfc01..db4028ee9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/TitleManager.java
@@ -7,10 +7,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class TitleManager {
 
 	private static final int fadein = 5, duration = 20, fadeout = 10;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/WorldManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/WorldManager.java
index 449e8d750..6f6d3552a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/WorldManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/WorldManager.java
@@ -24,10 +24,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class WorldManager {
 
 	private static final String customSeedWorldPrefix = "pregenerated_";
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeBossBar.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeBossBar.java
index 701d7da05..90158fe5f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeBossBar.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeBossBar.java
@@ -19,10 +19,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ChallengeBossBar {
 
 	private final Map<Player, BossBar> bossbars = new ConcurrentHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java
index 0409e0ceb..d0f6093d6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/server/scoreboard/ChallengeScoreboard.java
@@ -18,10 +18,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ChallengeScoreboard {
 
 	private final Map<Player, Objective> objectives = new ConcurrentHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/LeaderboardInfo.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/LeaderboardInfo.java
index 7054dbfac..923e1ad3f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/LeaderboardInfo.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/LeaderboardInfo.java
@@ -5,10 +5,6 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class LeaderboardInfo {
 
 	private final Map<Statistic, Integer> values = new EnumMap<>(Statistic.class);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/PlayerStats.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/PlayerStats.java
index 35237f673..fd29c7090 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/PlayerStats.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/PlayerStats.java
@@ -9,10 +9,6 @@
 import java.util.Map.Entry;
 import java.util.UUID;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class PlayerStats {
 
 	private final Map<Statistic, Double> values = new EnumMap<>(Statistic.class);
@@ -66,4 +62,4 @@ public String toString() {
 		return "PlayerStats" + values;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/Statistic.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/Statistic.java
index e00959c3c..1fec51752 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/Statistic.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/Statistic.java
@@ -5,10 +5,6 @@
 import javax.annotation.Nonnull;
 import java.util.function.Function;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public enum Statistic {
 
 	DRAGON_KILLED(Display.INTEGER),
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java
index d620bd304..c7982e92b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/management/stats/StatsManager.java
@@ -23,11 +23,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/KxmischesDomi
- * @since 2.0
- */
 public final class StatsManager implements Listener {
 
 	@Getter
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/BackCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/BackCommand.java
index 786a7ba4e..7c986528c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/BackCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/BackCommand.java
@@ -23,10 +23,6 @@
 
 import java.util.*;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class BackCommand implements PlayerCommand, TabCompleter, Listener {
 
 	private final Map<UUID, List<Location>> lastLocations = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ChallengesCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ChallengesCommand.java
index cfa0f993a..8b5572568 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ChallengesCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ChallengesCommand.java
@@ -16,10 +16,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class ChallengesCommand implements PlayerCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java
index fb3a0bdc1..734718d29 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/DatabaseCommand.java
@@ -20,10 +20,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class DatabaseCommand implements PlayerCommand, TabCompleter {
 
 	private final Map<String, DatabaseCommandExecutor> databaseExecutors;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FeedCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FeedCommand.java
index d7ad4f38a..6bc0b1e5a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FeedCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FeedCommand.java
@@ -13,10 +13,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class FeedCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FlyCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FlyCommand.java
index bdf981f42..e176ea9dc 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FlyCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/FlyCommand.java
@@ -13,10 +13,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class FlyCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java
index 6331305a2..8b042bdc7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamemodeCommand.java
@@ -16,10 +16,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class GamemodeCommand implements SenderCommand, Completer {
 
 	@Override
@@ -96,4 +92,4 @@ public List<String> onTabComplete(@Nonnull CommandSender sender, @Nonnull String
 		return Utils.filterRecommendations(args[0], "0", "1", "2", "3", "survival", "creative", "spectator", "adventure", "s", "c", "sp", "a");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamestateCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamestateCommand.java
index 54460ea86..1d8263af7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamestateCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GamestateCommand.java
@@ -14,10 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class GamestateCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GodModeCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GodModeCommand.java
index d273281f6..53587b632 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GodModeCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/GodModeCommand.java
@@ -19,10 +19,6 @@
 import java.util.List;
 import java.util.UUID;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class GodModeCommand implements SenderCommand, Completer, Listener {
 
     private final List<UUID> godModePlayers = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java
index c9c4bc7c2..0a47e3dd3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HealCommand.java
@@ -17,10 +17,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class HealCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HelpCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HelpCommand.java
index 16edf99c0..75dc5098f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HelpCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/HelpCommand.java
@@ -5,10 +5,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class HelpCommand implements SenderCommand {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/InvseeCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/InvseeCommand.java
index 07eb9fed9..d5e8cd095 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/InvseeCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/InvseeCommand.java
@@ -28,10 +28,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class InvseeCommand implements PlayerCommand, Listener {
 
 	private static final int
@@ -138,4 +134,4 @@ public void onClose(@Nonnull InventoryCloseEvent event) {
 		}, 1);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java
index 186da232c..2dca85891 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LanguageCommand.java
@@ -13,10 +13,6 @@
 
 import java.util.List;
 
-/**
- * @author rollocraft | https://github.com/rollocraft
- * @since 2.3.2
- */
 public class LanguageCommand implements SenderCommand, Completer {
 
     @Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LeaderboardCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LeaderboardCommand.java
index 1e9024ae2..8bbfb3e95 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LeaderboardCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/LeaderboardCommand.java
@@ -24,10 +24,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class LeaderboardCommand implements PlayerCommand {
 
 	protected static final int[] slots = StatsHelper.getSlots(1);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResetCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResetCommand.java
index 547e55374..b43981339 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResetCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResetCommand.java
@@ -16,10 +16,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class ResetCommand implements SenderCommand, Completer {
 
 	private final boolean confirmReset, seedResetCommand;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResultCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResultCommand.java
index a506664db..895769031 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResultCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/ResultCommand.java
@@ -11,10 +11,6 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.1.4
- */
 public class ResultCommand implements PlayerCommand {
 	@Override
 	public void onCommand(@NotNull Player player, @NotNull String[] args) throws Exception {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SearchCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SearchCommand.java
index 1908296f7..10ddd47ce 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SearchCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SearchCommand.java
@@ -22,10 +22,6 @@
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class SearchCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SkipTimerCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SkipTimerCommand.java
index 955c71e30..93fbafdeb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SkipTimerCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/SkipTimerCommand.java
@@ -12,10 +12,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 public class SkipTimerCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java
index a07af3445..e98dbc4f7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/StatsCommand.java
@@ -26,11 +26,6 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/KxmischesDomi
- * @since 2.0
- */
 public class StatsCommand implements PlayerCommand {
 
 	private final Map<Player, Long> submitTimeByPlayer = new ConcurrentHashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java
index 274cdb835..fd133bf74 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimeCommand.java
@@ -15,10 +15,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class TimeCommand implements PlayerCommand, Completer {
 
 	private final Map<Long, String> names;
@@ -141,4 +137,4 @@ public List<String> onTabComplete(@Nonnull CommandSender sender, @Nonnull String
 		return new ArrayList<>();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java
index b775201be..dc9162d1c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/TimerCommand.java
@@ -19,10 +19,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class TimerCommand implements SenderCommand, Completer {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/VillageCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/VillageCommand.java
index 2fd574faf..40c3ffe17 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/VillageCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/VillageCommand.java
@@ -12,10 +12,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class VillageCommand implements PlayerCommand {
 
 	@Override
@@ -45,4 +41,4 @@ public void onCommand(@Nonnull Player player, @Nonnull String[] args) throws Exc
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WeatherCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WeatherCommand.java
index 07726539a..c66a33394 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WeatherCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WeatherCommand.java
@@ -14,10 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class WeatherCommand implements PlayerCommand, Completer {
 
 	@Override
@@ -61,4 +57,4 @@ public List<String> onTabComplete(@Nonnull CommandSender sender, @Nonnull String
 		return Utils.filterRecommendations(args[0], "sun", "clear", "rain", "thunder");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WorldCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WorldCommand.java
index f8f99b2b6..c6ba05aca 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WorldCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/command/WorldCommand.java
@@ -20,10 +20,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class WorldCommand implements PlayerCommand, TabCompleter {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDamageByPlayerEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDamageByPlayerEvent.java
index 96c69d567..be99a6abe 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDamageByPlayerEvent.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDamageByPlayerEvent.java
@@ -8,10 +8,6 @@
 import org.bukkit.event.entity.EntityEvent;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class EntityDamageByPlayerEvent extends EntityEvent implements Cancellable {
 
 	private static final HandlerList handlers = new HandlerList();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDeathByPlayerEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDeathByPlayerEvent.java
index 5263b12d8..3517e3138 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDeathByPlayerEvent.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/EntityDeathByPlayerEvent.java
@@ -8,10 +8,6 @@
 import org.bukkit.event.entity.EntityEvent;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class EntityDeathByPlayerEvent extends EntityEvent implements Cancellable {
 
 	private static final HandlerList handlers = new HandlerList();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/InventoryClickEventWrapper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/InventoryClickEventWrapper.java
index ee878c652..018156bf1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/InventoryClickEventWrapper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/InventoryClickEventWrapper.java
@@ -14,10 +14,6 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public abstract class InventoryClickEventWrapper extends Event {
 
 	private final InventoryClickEvent event;
@@ -126,4 +122,4 @@ public boolean isShiftClick() {
 		return event.isShiftClick();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerIgnoreStatusChangeEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerIgnoreStatusChangeEvent.java
index 32043c476..b65366107 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerIgnoreStatusChangeEvent.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerIgnoreStatusChangeEvent.java
@@ -5,10 +5,6 @@
 import org.bukkit.event.player.PlayerEvent;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class PlayerIgnoreStatusChangeEvent extends PlayerEvent {
 
 	private static final HandlerList handlers = new HandlerList();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java
index 9f8bf56ed..098ead5c2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerInventoryClickEvent.java
@@ -7,10 +7,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class PlayerInventoryClickEvent extends InventoryClickEventWrapper {
 
 	private static final HandlerList handlers = new HandlerList();
@@ -34,4 +30,4 @@ public HandlerList getHandlers() {
 		return getHandlerList();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerJumpEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerJumpEvent.java
index d3531fcdb..975740144 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerJumpEvent.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerJumpEvent.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class PlayerJumpEvent extends PlayerEvent implements Cancellable {
 
 	private static final HandlerList handlers = new HandlerList();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerPickupItemEvent.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerPickupItemEvent.java
index 7287968b0..9a52cf53a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerPickupItemEvent.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/events/PlayerPickupItemEvent.java
@@ -9,10 +9,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 @Getter
 public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
 
@@ -48,4 +44,4 @@ public void setCancelled(boolean cancel) {
 	public HandlerList getHandlers() {
 		return handlers;
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java
index c2d29a2ba..bc3609180 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/generator/VoidMapGenerator.java
@@ -11,10 +11,6 @@
 import javax.annotation.Nonnull;
 import java.util.Random;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class VoidMapGenerator extends ChunkGenerator {
 
 	private static final boolean generateEndPortal = MinecraftVersion.current().getMinor() == 18;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/BlockDropListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/BlockDropListener.java
index e80518a57..d93e5c6cd 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/BlockDropListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/BlockDropListener.java
@@ -19,10 +19,6 @@
 import javax.annotation.Nonnull;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class BlockDropListener implements Listener {
 
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ChatInputListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ChatInputListener.java
index 38ca8e8ad..32aef252e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ChatInputListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ChatInputListener.java
@@ -12,10 +12,6 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1
- */
 public class ChatInputListener implements Listener {
 
 	private static Map<UUID, Consumer<AsyncPlayerChatEvent>> inputActions = new HashMap<>();
@@ -44,4 +40,4 @@ public void onQuit(PlayerQuitEvent event) {
 		inputActions.remove(event.getPlayer().getUniqueId());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java
index 77e1f9086..c17bda8ed 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CheatListener.java
@@ -17,10 +17,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class CheatListener implements Listener {
 
 	public CheatListener() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java
index 411e1fde7..5d12811ae 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/CustomEventListener.java
@@ -20,10 +20,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class CustomEventListener implements Listener {
 
 	/**
@@ -94,4 +90,4 @@ public void onGameModeChange(PlayerGameModeChangeEvent event) {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ExtraWorldRestrictionListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ExtraWorldRestrictionListener.java
index 9a2cb4a66..a3348e7e1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ExtraWorldRestrictionListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ExtraWorldRestrictionListener.java
@@ -13,10 +13,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class ExtraWorldRestrictionListener implements Listener {
 
 	@EventHandler(priority = EventPriority.LOW)
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/GeneratorWorldsListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/GeneratorWorldsListener.java
index 1d3481cb1..885f17067 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/GeneratorWorldsListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/GeneratorWorldsListener.java
@@ -12,10 +12,6 @@
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.0
- */
 public class GeneratorWorldsListener implements Listener {
 
 	@EventHandler(priority = EventPriority.LOW)
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/HelpListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/HelpListener.java
index bd818993c..73acb3143 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/HelpListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/HelpListener.java
@@ -16,10 +16,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class HelpListener implements Listener {
 
 	@EventHandler(priority = EventPriority.MONITOR)
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/PlayerConnectionListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/PlayerConnectionListener.java
index 103d4577e..720988271 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/PlayerConnectionListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/PlayerConnectionListener.java
@@ -20,10 +20,6 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class PlayerConnectionListener implements Listener {
 
 	private final boolean messages;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/RestrictionListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/RestrictionListener.java
index b73b68131..523b9331c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/RestrictionListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/RestrictionListener.java
@@ -23,11 +23,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class RestrictionListener implements Listener {
 
 	@EventHandler(priority = EventPriority.LOW)
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ScoreboardUpdateListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ScoreboardUpdateListener.java
index 3e4ea849b..71f3d03b3 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ScoreboardUpdateListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/ScoreboardUpdateListener.java
@@ -7,10 +7,6 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.2
- */
 public class ScoreboardUpdateListener implements Listener {
 
 	@EventHandler
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/StatsListener.java b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/StatsListener.java
index 1e23c0883..57c560066 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/StatsListener.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/spigot/listener/StatsListener.java
@@ -33,11 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @see net.codingarea.challenges.plugin.management.stats.StatsManager
- * @since 2.0
- */
 public class StatsListener implements Listener {
 
 	private final List<Player> dragonDamager = new ArrayList<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/Completer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/Completer.java
index 623717492..c81a982d1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/Completer.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/Completer.java
@@ -8,10 +8,6 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public interface Completer extends TabCompleter {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/ForwardingCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/ForwardingCommand.java
index 8b4fe018f..9ccfbb7fb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/ForwardingCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/ForwardingCommand.java
@@ -10,10 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public class ForwardingCommand implements SenderCommand, TabCompleter {
 
 	private final String forwardCommand;
@@ -39,4 +35,4 @@ public List<String> onTabComplete(@Nonnull CommandSender sender, @Nonnull Comman
 		return overrideTab ? new ArrayList<>() : null;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/PlayerCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/PlayerCommand.java
index 5ef0b43dd..385740ae8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/PlayerCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/PlayerCommand.java
@@ -10,10 +10,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public interface PlayerCommand extends CommandExecutor {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/SenderCommand.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/SenderCommand.java
index 1fc276e71..41aca835e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/SenderCommand.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/command/SenderCommand.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public interface SenderCommand extends CommandExecutor {
 
 	@Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java
index b3396201c..e94d0de28 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/BukkitSerialization.java
@@ -11,10 +11,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.1.3
- */
 public class BukkitSerialization {
 
 	/**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/PlayerData.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/PlayerData.java
index d67dc877d..3a64320c8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/PlayerData.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/container/PlayerData.java
@@ -9,10 +9,6 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @Data
 public final class PlayerData {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/IJumpGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/IJumpGenerator.java
index 458297fc4..8f2c6bb10 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/IJumpGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/IJumpGenerator.java
@@ -6,10 +6,6 @@
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 @FunctionalInterface
 public interface IJumpGenerator {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/RandomJumpGenerator.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/RandomJumpGenerator.java
index 4bf485b51..18bf7befa 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/RandomJumpGenerator.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/jumpgeneration/RandomJumpGenerator.java
@@ -7,10 +7,6 @@
 import javax.annotation.Nonnull;
 
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public class RandomJumpGenerator implements IJumpGenerator {
 
 	@Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java
index dbb121a81..8b03d4c7d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/BukkitStringUtils.java
@@ -18,10 +18,6 @@
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.2.0
- */
 public class BukkitStringUtils {
 
 	@Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java
index bc7e1afcd..fe0353359 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/misc/Version/MinecraftVersion.java
@@ -5,10 +5,6 @@
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public enum MinecraftVersion implements Version {
 
     V1_0,       // 1.0
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java
index 9358640a4..f899d1aaa 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSProvider.java
@@ -12,10 +12,6 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class NMSProvider {
 
     private final static int majorVersion;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSUtils.java
index f051f5944..ca81f2938 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/NMSUtils.java
@@ -6,10 +6,6 @@
 import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Entity;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.0
- */
 public final class NMSUtils {
 
     public static void setEntityName(Entity entity, BaseComponent baseComponent) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java
index b8e2705c0..3dd617ac6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/ReflectionUtil.java
@@ -14,7 +14,6 @@
 /**
  * @author TobiasDeBruijn | https://github.com/TobiasDeBruijn
  * @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil
- * @since 2.2.0
  */
 public class ReflectionUtil {
 
@@ -497,4 +496,4 @@ private static String getModifiers(int modifiers) {
 
 		return modifiersStr.toString().trim();
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java
index a9f99d719..d2f329402 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/BorderPacketFactory_1_13.java
@@ -6,10 +6,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.BorderPacketFactory;
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.PacketBorder;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class BorderPacketFactory_1_13 extends BorderPacketFactory {
 
     @Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/CraftPlayer_1_13.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/CraftPlayer_1_13.java
index f744646f1..97968be4f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/CraftPlayer_1_13.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/CraftPlayer_1_13.java
@@ -5,10 +5,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.CraftPlayer;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class CraftPlayer_1_13 extends CraftPlayer {
     /**
      * @param player   The player to create the CraftPlayer for
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PacketBorder_1_13.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PacketBorder_1_13.java
index d38986f12..a5c65b210 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PacketBorder_1_13.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PacketBorder_1_13.java
@@ -9,10 +9,6 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class PacketBorder_1_13 extends PacketBorder {
     /**
      * Creates a new packet border.
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PlayerConnection_1_13.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PlayerConnection_1_13.java
index 6cf52e01c..4720ffea6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PlayerConnection_1_13.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/PlayerConnection_1_13.java
@@ -5,10 +5,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.ReflectionUtil;
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.PlayerConnection;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class PlayerConnection_1_13 extends PlayerConnection {
     public PlayerConnection_1_13(Object connection) throws ClassNotFoundException {
         super(NMSUtils.getClass("network.protocol.Packet"), connection);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/WorldServer_1_13.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/WorldServer_1_13.java
index 101b6e094..62e7037e4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/WorldServer_1_13.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_13/WorldServer_1_13.java
@@ -5,10 +5,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.WorldServer;
 import org.bukkit.World;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class WorldServer_1_13 extends WorldServer {
 
     /**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/BorderPacketFactory_1_17.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/BorderPacketFactory_1_17.java
index e4eb93d55..678a0bfe7 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/BorderPacketFactory_1_17.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/BorderPacketFactory_1_17.java
@@ -6,10 +6,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.BorderPacketFactory;
 import net.codingarea.challenges.plugin.utils.bukkit.nms.type.PacketBorder;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class BorderPacketFactory_1_17 extends BorderPacketFactory {
 
     @Override
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/CraftPlayer_1_17.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/CraftPlayer_1_17.java
index 59b650c0b..2798bf7c4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/CraftPlayer_1_17.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/CraftPlayer_1_17.java
@@ -5,10 +5,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.ReflectionUtil;
 import org.bukkit.entity.Player;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class CraftPlayer_1_17 extends CraftPlayer {
 
     /**
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java
index c251270f5..8e991c636 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_17/PacketBorder_1_17.java
@@ -6,10 +6,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.implementations.v1_13.PacketBorder_1_13;
 import org.bukkit.World;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class PacketBorder_1_17 extends PacketBorder_1_13 {
 
     public PacketBorder_1_17(World world) {
@@ -30,4 +26,4 @@ protected Object createWorldBorder() {
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PacketBorder_1_18.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PacketBorder_1_18.java
index 56345b44a..f1a3c832a 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PacketBorder_1_18.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PacketBorder_1_18.java
@@ -5,10 +5,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.implementations.v1_17.PacketBorder_1_17;
 import org.bukkit.World;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class PacketBorder_1_18 extends PacketBorder_1_17 {
 
     public PacketBorder_1_18(World world) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PlayerConnection_1_18.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PlayerConnection_1_18.java
index fadc1c6a7..c466e679c 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PlayerConnection_1_18.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/implementations/v1_18/PlayerConnection_1_18.java
@@ -4,10 +4,6 @@
 import net.codingarea.challenges.plugin.utils.bukkit.nms.ReflectionUtil;
 import net.codingarea.challenges.plugin.utils.bukkit.nms.implementations.v1_13.PlayerConnection_1_13;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class PlayerConnection_1_18 extends PlayerConnection_1_13 {
 
     public PlayerConnection_1_18(Object connection) throws ClassNotFoundException {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/AbstractNMSClass.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/AbstractNMSClass.java
index 889900976..79cf77cd9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/AbstractNMSClass.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/AbstractNMSClass.java
@@ -1,11 +1,5 @@
 package net.codingarea.challenges.plugin.utils.bukkit.nms.type;
 
-/**
- * An abstract class for other classes that represent NMS classes
-
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public abstract class AbstractNMSClass {
 
     protected final Class<?> nmsClass;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BorderPacketFactory.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BorderPacketFactory.java
index 4d7a4b239..04d514842 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BorderPacketFactory.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BorderPacketFactory.java
@@ -1,9 +1,5 @@
 package net.codingarea.challenges.plugin.utils.bukkit.nms.type;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public abstract class BorderPacketFactory {
 
     public abstract Object center(PacketBorder packetBorder);
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BukkitNMSClass.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BukkitNMSClass.java
index 998e1774a..2b3afb1eb 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BukkitNMSClass.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/BukkitNMSClass.java
@@ -2,9 +2,6 @@
 
 /**
  * Used for nms classes that are represented by a bukkit class
- * @param <T> The bukkit type that represents the NMS class
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
  */
 public abstract class BukkitNMSClass<T> extends AbstractNMSClass {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java
index 2f2999bf6..48e101f32 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/CraftPlayer.java
@@ -6,7 +6,6 @@
 /**
  * @author TobiasDeBruijn | https://github.com/TobiasDeBruijn
  * @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil
- * @since 2.2.0
  */
 public abstract class CraftPlayer extends BukkitNMSClass<Player> {
 
@@ -31,4 +30,4 @@ public CraftPlayer(Class<?> nmsClass, Player player) {
 	public PlayerConnection getConnection() {
 		return NMSProvider.createPlayerConnection(this);
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PacketBorder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PacketBorder.java
index 6d35b748b..0a5d1ac8f 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PacketBorder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PacketBorder.java
@@ -11,8 +11,6 @@
 
 /**
  * Provides a WorldBorder that can be sent to the client via packets
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
  */
 public abstract class PacketBorder extends AbstractNMSClass {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java
index fbc1526e4..1625cb2c2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/PlayerConnection.java
@@ -3,7 +3,6 @@
 /**
  * @author TobiasDeBruijn | https://github.com/TobiasDeBruijn
  * @source https://github.com/TobiasDeBruijn/BukkitReflectionUtil
- * @since 2.2.0
  */
 public abstract class PlayerConnection extends AbstractNMSClass {
 
@@ -22,4 +21,4 @@ public PlayerConnection(Class<?> nmsClass, Object connection) {
 	 * @param packet The packet to send
 	 */
 	public abstract void sendPacket(Object packet);
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/WorldServer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/WorldServer.java
index 7737f65ed..48a91c78b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/WorldServer.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/bukkit/nms/type/WorldServer.java
@@ -2,10 +2,6 @@
 
 import org.bukkit.World;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public abstract class WorldServer extends BukkitNMSClass<World> {
 	/**
 	 * @param object   The instance of the specified bukkit type
@@ -18,4 +14,4 @@ protected WorldServer(World object, Class<?> nmsClass) {
 	public Object getWorldServerObject() {
 		return nmsObject;
 	}
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java
index b7fb9d587..7857104ad 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/DefaultItem.java
@@ -10,10 +10,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class DefaultItem {
 
 	private static final String ARROW_LEFT = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjAwNmVjMWVjYTJmMjY4NWY3MGU2NTQxMWNmZTg4MDhhMDg4ZjdjZjA4MDg3YWQ4ZWVjZTk2MTgzNjEwNzBlMyJ9fX0=",
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java
index 24ca1b091..24f8ed898 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemBuilder.java
@@ -29,10 +29,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 1.0
- */
 public class ItemBuilder extends net.anweisen.utilities.bukkit.utils.item.ItemBuilder {
 
 	public static final ItemStack BLOCKED_ITEM = new ItemBuilder(Material.BARRIER, "§cBlocked").build();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java
index b7afc6b48..716d88602 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/item/ItemUtils.java
@@ -9,10 +9,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class ItemUtils {
 
     @Nonnull
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/logging/ConsolePrint.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/logging/ConsolePrint.java
index 66c2eeeca..43eaa118e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/logging/ConsolePrint.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/logging/ConsolePrint.java
@@ -6,10 +6,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ConsolePrint {
 
 	private ConsolePrint() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ArmorUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ArmorUtils.java
index fa142bc00..e80deebf8 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ArmorUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ArmorUtils.java
@@ -2,10 +2,6 @@
 
 import org.bukkit.Material;
 
-/**
- * @author KxmischesDomi | https://github.com/KxmischesDomi
- * @since 2.0
- */
 public final class ArmorUtils {
 
 	private ArmorUtils() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java
index dfbf273fd..edee046dd 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/BlockUtils.java
@@ -11,11 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public final class BlockUtils {
 
 	private static final BlockFace[] faces = {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ColorConversions.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ColorConversions.java
index 2078261ed..7ac2e0cd9 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ColorConversions.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ColorConversions.java
@@ -10,10 +10,6 @@
 import java.util.Map;
 import java.util.Optional;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ColorConversions {
 
 	private static final Map<ChatColor, Color> colorsByChatColor = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/CommandHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/CommandHelper.java
index 6bbe268ee..34cdc714d 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/CommandHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/CommandHelper.java
@@ -14,10 +14,6 @@
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public final class CommandHelper {
 
 	private CommandHelper() {
@@ -95,4 +91,4 @@ public static Player getNearestPlayer(@Nonnull Location location) {
 		return currentPlayer;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/DatabaseHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/DatabaseHelper.java
index a19871374..d4f1bb209 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/DatabaseHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/DatabaseHelper.java
@@ -13,10 +13,6 @@
 import javax.annotation.Nullable;
 import java.util.*;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class DatabaseHelper {
 
 	private static final Map<UUID, String> cachedTextures = new HashMap<>();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/EntityUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/EntityUtils.java
index 80ea08eaf..8c1dd221e 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/EntityUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/EntityUtils.java
@@ -8,10 +8,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public final class EntityUtils {
 
 	private EntityUtils() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/FontUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/FontUtils.java
index 72a417e32..760fc54d4 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/FontUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/FontUtils.java
@@ -4,10 +4,6 @@
 
 import java.util.LinkedList;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class FontUtils {
 
 	private static final char[] SMALL_CAPS_ALPHABET = "ᴀʙᴄᴅᴇғɢʜɪᴊᴋʟᴍɴᴏᴘǫʀsᴛᴜᴠᴡxʏᴢ".toCharArray();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java
index b0d52e334..f64928ea6 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ImageUtils.java
@@ -11,10 +11,6 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ImageUtils {
 
 	public static final char IMAGE_CHAR = '█';
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/InventoryUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/InventoryUtils.java
index e055de09c..b0e6af5f5 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/InventoryUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/InventoryUtils.java
@@ -23,11 +23,6 @@
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public final class InventoryUtils {
 
 	private static final IRandom random;
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java
index 95eb84774..3b4ddbff2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ListBuilder.java
@@ -7,10 +7,6 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 2.0
- */
 public final class ListBuilder<T> {
 
 	private final List<T> list = new ArrayList<>();
@@ -76,4 +72,4 @@ public List<T> build() {
 		return list;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/MapUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/MapUtils.java
index fc334406b..650d72cf1 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/MapUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/MapUtils.java
@@ -6,10 +6,6 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public class MapUtils {
 
 	public static Map<String, String> createStringMap(String... data) {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/NameHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/NameHelper.java
index 2534de3eb..4d2650c64 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/NameHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/NameHelper.java
@@ -6,10 +6,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class NameHelper {
 
 	private NameHelper() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ParticleUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ParticleUtils.java
index 46efced22..a72079576 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ParticleUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/ParticleUtils.java
@@ -18,13 +18,6 @@
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * This class contains util methods to create fancy particles.
- * Most of these methods were found in {@link Utils} previously (pre 2.0).
- *
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class ParticleUtils {
 
 	private static final IRandom iRandom = IRandom.create();
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StatsHelper.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StatsHelper.java
index 7c1e91f32..33ae0e17b 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StatsHelper.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StatsHelper.java
@@ -8,10 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @since 2.0
- */
 public final class StatsHelper {
 
 	private StatsHelper() {
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StructureUtils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StructureUtils.java
index 831820d5c..a163910ab 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StructureUtils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/StructureUtils.java
@@ -3,10 +3,6 @@
 import org.bukkit.Material;
 import org.bukkit.StructureType;
 
-/**
- * @author sehrschlechtYT | https://github.com/sehrschlechtYT
- * @since 2.2.3
- */
 public class StructureUtils {
     public static Material getStructureIcon(StructureType structureType) {
 
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/TriConsumer.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/TriConsumer.java
index 278dbc026..e5951b662 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/TriConsumer.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/TriConsumer.java
@@ -1,11 +1,7 @@
 package net.codingarea.challenges.plugin.utils.misc;
 
-/**
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public interface TriConsumer<A, B, C> {
 
 	void accept(A a, B b, C c);
 
-}
\ No newline at end of file
+}
diff --git a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/Utils.java b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/Utils.java
index ea856217c..8ba0c86d2 100644
--- a/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/Utils.java
+++ b/plugin/src/main/java/net/codingarea/challenges/plugin/utils/misc/Utils.java
@@ -14,11 +14,6 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
-/**
- * @author anweisen | https://github.com/anweisen
- * @author KxmischesDomi | https://github.com/kxmischesdomi
- * @since 1.0
- */
 public final class Utils {
 
 	private Utils() {