diff --git a/.github/workflows/build_validator.yml b/.github/workflows/build_validator.yml
index e6ea6a06..de8aed86 100644
--- a/.github/workflows/build_validator.yml
+++ b/.github/workflows/build_validator.yml
@@ -28,7 +28,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.jdk }}
-        distribution: 'adopt'
     - name: Validate Gradle wrapper
       uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
     - name: Make gradlew executable
diff --git a/src/builder/resources/speiger/assets/collections/templates/collections/AbstractCollection.template b/src/builder/resources/speiger/assets/collections/templates/collections/AbstractCollection.template
index 083ad9af..6443b86e 100644
--- a/src/builder/resources/speiger/assets/collections/templates/collections/AbstractCollection.template
+++ b/src/builder/resources/speiger/assets/collections/templates/collections/AbstractCollection.template
@@ -100,7 +100,6 @@ public abstract class ABSTRACT_COLLECTION KEY_GENERIC_TYPE extends AbstractColle
 	 * This implementation iterates over the elements of the collection and checks if they are stored in this collection
 	 * @param c the elements that should be checked for
 	 * @return true if any element is in this collection
-	 * @deprecated if this is a primitive collection
 	 * @throws java.lang.NullPointerException if the collection is null
 	 */
 	@Override
diff --git a/src/builder/resources/speiger/assets/collections/templates/maps/interfaces/SortedMap.template b/src/builder/resources/speiger/assets/collections/templates/maps/interfaces/SortedMap.template
index a720ad38..5169d74b 100644
--- a/src/builder/resources/speiger/assets/collections/templates/maps/interfaces/SortedMap.template
+++ b/src/builder/resources/speiger/assets/collections/templates/maps/interfaces/SortedMap.template
@@ -33,6 +33,7 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_MAP#putAndMoveToFirst instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public VALUE_TYPE putAndMoveToFirst(KEY_TYPE key, VALUE_TYPE value);
 	/**
 	 * A customized put method that allows you to insert into the last index. (This may be nessesary depending on the implementation)
@@ -43,6 +44,7 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_MAP#putAndMoveToLast instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public VALUE_TYPE putAndMoveToLast(KEY_TYPE key, VALUE_TYPE value);
 	
 	/**
@@ -53,6 +55,7 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_MAP#moveToFirst instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public boolean moveToFirst(KEY_TYPE key);
 	/**
 	 * A specific move method to move a given key/value to the last index.
@@ -62,6 +65,7 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_MAP#moveToLast instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public boolean moveToLast(KEY_TYPE key);
 	
 	/**
@@ -71,6 +75,7 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_MAP#getAndMoveToFirst instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public VALUE_TYPE getAndMoveToFirst(KEY_TYPE key);
 	/**
 	 * A Specific get method that allows to move teh given key/value int the last index.
@@ -79,6 +84,7 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_MAP#getAndMoveToLast instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public VALUE_TYPE getAndMoveToLast(KEY_TYPE key);
 	
 	@Override
diff --git a/src/builder/resources/speiger/assets/collections/templates/sets/SortedSet.template b/src/builder/resources/speiger/assets/collections/templates/sets/SortedSet.template
index a6cd23e7..e90a47b8 100644
--- a/src/builder/resources/speiger/assets/collections/templates/sets/SortedSet.template
+++ b/src/builder/resources/speiger/assets/collections/templates/sets/SortedSet.template
@@ -30,6 +30,7 @@ public interface SORTED_SET KEY_GENERIC_TYPE extends ORDERED_SET KEY_GENERIC_TYP
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_SET#addAndMoveToFirst instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public boolean addAndMoveToFirst(KEY_TYPE o);
 	/**
 	 * A customized add method that allows you to insert into the last index.
@@ -39,6 +40,7 @@ public interface SORTED_SET KEY_GENERIC_TYPE extends ORDERED_SET KEY_GENERIC_TYP
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_SET#addAndMoveToLast instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public boolean addAndMoveToLast(KEY_TYPE o);
 	
 	/**
@@ -49,6 +51,7 @@ public interface SORTED_SET KEY_GENERIC_TYPE extends ORDERED_SET KEY_GENERIC_TYP
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_SET#moveToFirst instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public boolean moveToFirst(KEY_TYPE o);
 	/**
 	 * A specific move method to move a given key to the last index.
@@ -58,6 +61,7 @@ public interface SORTED_SET KEY_GENERIC_TYPE extends ORDERED_SET KEY_GENERIC_TYP
 	 * @note some implementations do not support this method
 	 * @deprecated use ORDERED_SET#moveToLast instead (removed in 0.6.0)
 	 */
+	@Deprecated
 	public boolean moveToLast(KEY_TYPE o);
 	
 	/**