diff --git a/src/main/java/org/apache/commons/collections4/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java
index deac7e6b3..c9bfed78f 100644
--- a/src/main/java/org/apache/commons/collections4/BagUtils.java
+++ b/src/main/java/org/apache/commons/collections4/BagUtils.java
@@ -245,7 +245,7 @@ public class BagUtils {
      */
     @SuppressWarnings("unchecked") // OK, empty bag is compatible with any type
     public static <E> Bag<E> emptyBag() {
-        return (Bag<E>) EMPTY_BAG;
+        return EMPTY_BAG;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java
index 44b50d873..053581cb3 100644
--- a/src/main/java/org/apache/commons/collections4/QueueUtils.java
+++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java
@@ -102,6 +102,6 @@ public class QueueUtils {
      */
     @SuppressWarnings("unchecked") // OK, empty queue is compatible with any type
     public static <E> Queue<E> emptyQueue() {
-        return (Queue<E>) EMPTY_QUEUE;
+        return EMPTY_QUEUE;
     }
 }
diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
index 21ea05934..1e1fd835d 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
@@ -51,7 +51,7 @@ public class ConstantFactory<T> implements Factory<T>, Serializable {
     @SuppressWarnings("unchecked") // The null factory works for all object types
     public static <T> Factory<T> constantFactory(final T constantToReturn) {
         if (constantToReturn == null) {
-            return (Factory<T>) NULL_INSTANCE;
+            return NULL_INSTANCE;
         }
         return new ConstantFactory<>(constantToReturn);
     }
diff --git a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
index 826a5266c..faaedf1c1 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
@@ -50,7 +50,7 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl
      */
     @SuppressWarnings("unchecked") // The null transformer works for all object types
     public static <I, O> Transformer<I, O> nullTransformer() {
-        return (Transformer<I, O>) NULL_INSTANCE;
+        return NULL_INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
index bf265e0a0..36c116d95 100644
--- a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
+++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
@@ -48,7 +48,7 @@ public class DefaultEquator<T> implements Equator<T>, Serializable {
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> DefaultEquator<T> defaultEquator() {
-        return (DefaultEquator<T>) DefaultEquator.INSTANCE;
+        return DefaultEquator.INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
index 73692980b..ce6843e05 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
@@ -44,7 +44,7 @@ public final class ExceptionClosure<E> implements Closure<E>, Serializable {
      */
     @SuppressWarnings("unchecked")  // the static instance works for all types
     public static <E> Closure<E> exceptionClosure() {
-        return (Closure<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
index 898b2fc90..a40b55390 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
@@ -44,7 +44,7 @@ public final class ExceptionFactory<T> implements Factory<T>, Serializable {
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> Factory<T> exceptionFactory() {
-        return (Factory<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
index 5399eaf78..6d8f2aa03 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
@@ -44,7 +44,7 @@ public final class ExceptionPredicate<T> implements Predicate<T>, Serializable {
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> Predicate<T> exceptionPredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
index f9b55f0ef..3626fb953 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
@@ -45,7 +45,7 @@ public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Seri
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <I, O> Transformer<I, O> exceptionTransformer() {
-        return (Transformer<I, O>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
index 26aaca32e..f88f01801 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
@@ -43,7 +43,7 @@ public final class FalsePredicate<T> implements Predicate<T>, Serializable {
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> Predicate<T> falsePredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
index 96b464cea..1ec9d153d 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
@@ -43,7 +43,7 @@ public final class NOPClosure<E> implements Closure<E>, Serializable {
      */
     @SuppressWarnings("unchecked")
     public static <E> Closure<E> nopClosure() {
-        return (Closure<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
index c2c4f6dfc..439902d27 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
@@ -43,7 +43,7 @@ public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<T, T> nopTransformer() {
-        return (Transformer<T, T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
index eab2f670b..e6a47c440 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
@@ -43,7 +43,7 @@ public final class NotNullPredicate<T> implements Predicate<T>, Serializable {
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> notNullPredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
index 1609c37d0..5c9c43a3d 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
@@ -43,7 +43,7 @@ public final class NullPredicate<T> implements Predicate<T>, Serializable {
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> nullPredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
index a04b334ce..2a899a415 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
@@ -43,7 +43,7 @@ public final class TruePredicate<T> implements Predicate<T>, Serializable {
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> truePredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
index 1ba2f886b..b381b575d 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
@@ -52,7 +52,7 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett
      */
     @SuppressWarnings("unchecked")
     public static <E> ResettableIterator<E> resettableEmptyIterator() {
-        return (ResettableIterator<E>) RESETTABLE_INSTANCE;
+        return RESETTABLE_INSTANCE;
     }
 
     /**
@@ -62,7 +62,7 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett
      */
     @SuppressWarnings("unchecked")
     public static <E> Iterator<E> emptyIterator() {
-        return (Iterator<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
index 92c431c35..f54e1e990 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
@@ -53,7 +53,7 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
      */
     @SuppressWarnings("unchecked")
     public static <E> ResettableListIterator<E> resettableEmptyListIterator() {
-        return (ResettableListIterator<E>) RESETTABLE_INSTANCE;
+        return RESETTABLE_INSTANCE;
     }
 
     /**
@@ -63,7 +63,7 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
      */
     @SuppressWarnings("unchecked")
     public static <E> ListIterator<E> emptyListIterator() {
-        return (ListIterator<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
index 3b97508fd..a89081143 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
@@ -42,7 +42,7 @@ public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> imple
      */
     @SuppressWarnings("unchecked")
     public static <K, V> MapIterator<K, V> emptyMapIterator() {
-        return (MapIterator<K, V>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
index ff9d386c4..3f5664efd 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
@@ -41,7 +41,7 @@ public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E>
      */
     @SuppressWarnings("unchecked")
     public static <E> OrderedIterator<E> emptyOrderedIterator() {
-        return (OrderedIterator<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
index 598c77a7b..dab9aed75 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
@@ -42,7 +42,7 @@ public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V
      */
     @SuppressWarnings("unchecked")
     public static <K, V> OrderedMapIterator<K, V> emptyOrderedMapIterator() {
-        return (OrderedMapIterator<K, V>) INSTANCE;
+        return INSTANCE;
     }
 
     /**