diff --git a/src/main/java/org/apache/commons/collections4/ArrayStack.java b/src/main/java/org/apache/commons/collections4/ArrayStack.java
index f6d5b90f7..e346ed0ce 100644
--- a/src/main/java/org/apache/commons/collections4/ArrayStack.java
+++ b/src/main/java/org/apache/commons/collections4/ArrayStack.java
@@ -38,7 +38,6 @@ import java.util.EmptyStackException;
  *
  * @see java.util.Stack
  * @since 1.0
- * @version $Id$
  * @deprecated use {@link java.util.ArrayDeque} instead (available from Java 1.6)
  */
 @Deprecated
diff --git a/src/main/java/org/apache/commons/collections4/Bag.java b/src/main/java/org/apache/commons/collections4/Bag.java
index d500506c3..96c194309 100644
--- a/src/main/java/org/apache/commons/collections4/Bag.java
+++ b/src/main/java/org/apache/commons/collections4/Bag.java
@@ -40,7 +40,6 @@ import java.util.Set;
  *
  * @param <E> the type held in the bag
  * @since 2.0
- * @version $Id$
  */
 public interface Bag<E> extends Collection<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/BagUtils.java b/src/main/java/org/apache/commons/collections4/BagUtils.java
index ac60e4757..deac7e6b3 100644
--- a/src/main/java/org/apache/commons/collections4/BagUtils.java
+++ b/src/main/java/org/apache/commons/collections4/BagUtils.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.bag.UnmodifiableSortedBag;
  * Provides utility methods and decorators for {@link Bag} and {@link SortedBag} instances.
  *
  * @since 2.1
- * @version $Id$
  */
 public class BagUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/BidiMap.java b/src/main/java/org/apache/commons/collections4/BidiMap.java
index fbf342c98..064094369 100644
--- a/src/main/java/org/apache/commons/collections4/BidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/BidiMap.java
@@ -39,7 +39,6 @@ import java.util.Set;
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id$
  */
 public interface BidiMap<K, V> extends IterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/BoundedCollection.java b/src/main/java/org/apache/commons/collections4/BoundedCollection.java
index edfa820b1..e0472191b 100644
--- a/src/main/java/org/apache/commons/collections4/BoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/BoundedCollection.java
@@ -29,7 +29,6 @@ import java.util.Collection;
  * @see CollectionUtils#maxSize
  *
  * @since 3.0
- * @version $Id$
  */
 public interface BoundedCollection<E> extends Collection<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/BoundedMap.java b/src/main/java/org/apache/commons/collections4/BoundedMap.java
index ec58f46af..ec61cd787 100644
--- a/src/main/java/org/apache/commons/collections4/BoundedMap.java
+++ b/src/main/java/org/apache/commons/collections4/BoundedMap.java
@@ -24,7 +24,6 @@ package org.apache.commons.collections4;
  * associated with the maximum number of elements.
  *
  * @since 3.0
- * @version $Id$
  */
 public interface BoundedMap<K, V> extends IterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/Closure.java b/src/main/java/org/apache/commons/collections4/Closure.java
index ff1de7574..f9f513017 100644
--- a/src/main/java/org/apache/commons/collections4/Closure.java
+++ b/src/main/java/org/apache/commons/collections4/Closure.java
@@ -27,7 +27,6 @@ package org.apache.commons.collections4;
  *
  * @param <T> the type that the closure acts on
  * @since 1.0
- * @version $Id$
  */
 public interface Closure<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/ClosureUtils.java b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
index b3f18d61b..5a0f1e6a1 100644
--- a/src/main/java/org/apache/commons/collections4/ClosureUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ClosureUtils.java
@@ -55,7 +55,6 @@ import org.apache.commons.collections4.functors.WhileClosure;
  * </ul>
  *
  * @since 3.0
- * @version $Id$
  */
 public class ClosureUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
index e362db930..5b974cbcb 100644
--- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
@@ -50,7 +50,6 @@ import org.apache.commons.collections4.iterators.PermutationIterator;
  * NOTE: From 4.0, method parameters will take {@link Iterable} objects when possible.
  *
  * @since 1.0
- * @version $Id$
  */
 public class CollectionUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
index fa7da4339..f0302157d 100644
--- a/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.comparators.TransformingComparator;
  * in the <code>comparators</code> subpackage.
  *
  * @since 2.1
- * @version $Id$
  */
 public class ComparatorUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/EnumerationUtils.java b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java
index 301abec2b..7e726d0d5 100644
--- a/src/main/java/org/apache/commons/collections4/EnumerationUtils.java
+++ b/src/main/java/org/apache/commons/collections4/EnumerationUtils.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.iterators.EnumerationIterator;
  * Provides utility methods for {@link Enumeration} instances.
  *
  * @since 3.0
- * @version $Id$
  */
 public class EnumerationUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/Equator.java b/src/main/java/org/apache/commons/collections4/Equator.java
index 813fa9d63..0a2134dc6 100644
--- a/src/main/java/org/apache/commons/collections4/Equator.java
+++ b/src/main/java/org/apache/commons/collections4/Equator.java
@@ -18,7 +18,6 @@ package org.apache.commons.collections4;
  *
  * @param <T> the types of object this {@link Equator} can evaluate.
  * @since 4.0
- * @version $Id$
  */
 public interface Equator<T> {
     /**
diff --git a/src/main/java/org/apache/commons/collections4/Factory.java b/src/main/java/org/apache/commons/collections4/Factory.java
index 163bced20..bc444434d 100644
--- a/src/main/java/org/apache/commons/collections4/Factory.java
+++ b/src/main/java/org/apache/commons/collections4/Factory.java
@@ -29,7 +29,6 @@ package org.apache.commons.collections4;
  * @param <T> the type that the factory creates
  *
  * @since 2.1
- * @version $Id$
  */
 public interface Factory<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/FactoryUtils.java b/src/main/java/org/apache/commons/collections4/FactoryUtils.java
index e65c0ba44..b181251c4 100644
--- a/src/main/java/org/apache/commons/collections4/FactoryUtils.java
+++ b/src/main/java/org/apache/commons/collections4/FactoryUtils.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.functors.PrototypeFactory;
  * </ul>
  *
  * @since 3.0
- * @version $Id$
  */
 public class FactoryUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/FluentIterable.java b/src/main/java/org/apache/commons/collections4/FluentIterable.java
index d8563bfab..46acdbf05 100644
--- a/src/main/java/org/apache/commons/collections4/FluentIterable.java
+++ b/src/main/java/org/apache/commons/collections4/FluentIterable.java
@@ -61,7 +61,6 @@ import org.apache.commons.collections4.iterators.SingletonIterator;
  *
  * @param <E>  the element type
  * @since 4.1
- * @version $Id$
  */
 public class FluentIterable<E> implements Iterable<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/FunctorException.java b/src/main/java/org/apache/commons/collections4/FunctorException.java
index d774ba11c..a61d47b43 100644
--- a/src/main/java/org/apache/commons/collections4/FunctorException.java
+++ b/src/main/java/org/apache/commons/collections4/FunctorException.java
@@ -21,7 +21,6 @@ package org.apache.commons.collections4;
  * If required, a root cause error can be wrapped within this one.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FunctorException extends RuntimeException {
 
diff --git a/src/main/java/org/apache/commons/collections4/Get.java b/src/main/java/org/apache/commons/collections4/Get.java
index 7a1c8fa73..b414f8fc1 100644
--- a/src/main/java/org/apache/commons/collections4/Get.java
+++ b/src/main/java/org/apache/commons/collections4/Get.java
@@ -23,7 +23,6 @@ import java.util.Set;
  * The "read" subset of the {@link java.util.Map} interface.
  *
  * @since 4.0
- * @version $Id$
  *
  * @see Put
  */
diff --git a/src/main/java/org/apache/commons/collections4/IterableGet.java b/src/main/java/org/apache/commons/collections4/IterableGet.java
index 41fece02f..39c5bb8f5 100644
--- a/src/main/java/org/apache/commons/collections4/IterableGet.java
+++ b/src/main/java/org/apache/commons/collections4/IterableGet.java
@@ -20,7 +20,6 @@ package org.apache.commons.collections4;
  * The "read" subset of the {@link java.util.Map} interface.
  *
  * @since 4.0
- * @version $Id$
  *
  * @see Put
  */
diff --git a/src/main/java/org/apache/commons/collections4/IterableMap.java b/src/main/java/org/apache/commons/collections4/IterableMap.java
index 79f72388f..836aa2ab2 100644
--- a/src/main/java/org/apache/commons/collections4/IterableMap.java
+++ b/src/main/java/org/apache/commons/collections4/IterableMap.java
@@ -37,7 +37,6 @@ import java.util.Map;
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id$
  */
 public interface IterableMap<K, V> extends Map<K, V>, Put<K, V>, IterableGet<K, V> {
 }
diff --git a/src/main/java/org/apache/commons/collections4/IterableSortedMap.java b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
index 460bfd235..5970a162d 100644
--- a/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
@@ -25,7 +25,6 @@ import java.util.SortedMap;
  * @param <V> the type of the values in the map
  *
  * @since 4.0
- * @version $Id$
  */
 public interface IterableSortedMap<K, V> extends SortedMap<K, V>, OrderedMap<K, V> {
 }
diff --git a/src/main/java/org/apache/commons/collections4/IterableUtils.java b/src/main/java/org/apache/commons/collections4/IterableUtils.java
index d7ec92c27..ad24eeb6a 100644
--- a/src/main/java/org/apache/commons/collections4/IterableUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java
@@ -45,7 +45,6 @@ import org.apache.commons.collections4.iterators.UniqueFilterIterator;
  * </ul>
  *
  * @since 4.1
- * @version $Id$
  */
 public class IterableUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/IteratorUtils.java b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
index c603b7cff..cfce5b3b6 100644
--- a/src/main/java/org/apache/commons/collections4/IteratorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IteratorUtils.java
@@ -70,7 +70,6 @@ import org.w3c.dom.NodeList;
  * instances. The implementations are provided in the iterators subpackage.
  *
  * @since 2.1
- * @version $Id$
  */
 public class IteratorUtils {
     // validation is done in this class in certain cases because the
diff --git a/src/main/java/org/apache/commons/collections4/KeyValue.java b/src/main/java/org/apache/commons/collections4/KeyValue.java
index 62eff85c1..823334369 100644
--- a/src/main/java/org/apache/commons/collections4/KeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/KeyValue.java
@@ -26,7 +26,6 @@ package org.apache.commons.collections4;
  * @param <K> the type of the key
  * @param <V> the type of the value
  * @since 3.0
- * @version $Id$
  */
 public interface KeyValue<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java
index 8daf118f2..c81ca1181 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.sequence.SequencesComparator;
  * Provides utility methods and decorators for {@link List} instances.
  *
  * @since 1.0
- * @version $Id$
  */
 public class ListUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/ListValuedMap.java b/src/main/java/org/apache/commons/collections4/ListValuedMap.java
index f99d19f5f..f01da1fbf 100644
--- a/src/main/java/org/apache/commons/collections4/ListValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/ListValuedMap.java
@@ -28,7 +28,6 @@ import java.util.List;
  * </ul>
  *
  * @since 4.1
- * @version $Id$
  */
 public interface ListValuedMap<K, V> extends MultiValuedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/MapIterator.java b/src/main/java/org/apache/commons/collections4/MapIterator.java
index cfc48827b..46456b271 100644
--- a/src/main/java/org/apache/commons/collections4/MapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/MapIterator.java
@@ -43,7 +43,6 @@ import java.util.Iterator;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public interface MapIterator<K, V> extends Iterator<K> {
 
diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java
index 0ae9dba67..15dfe826c 100644
--- a/src/main/java/org/apache/commons/collections4/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -74,7 +74,6 @@ import org.apache.commons.collections4.map.UnmodifiableSortedMap;
  *  </ul>
  *
  * @since 1.0
- * @version $Id$
  */
 @SuppressWarnings("deprecation")
 public class MapUtils {
diff --git a/src/main/java/org/apache/commons/collections4/MultiMap.java b/src/main/java/org/apache/commons/collections4/MultiMap.java
index e77ef59b0..102451cc9 100644
--- a/src/main/java/org/apache/commons/collections4/MultiMap.java
+++ b/src/main/java/org/apache/commons/collections4/MultiMap.java
@@ -40,7 +40,6 @@ import java.util.Collection;
  * as they were defined in the superinterface <code>Map</code> anyway.
  *
  * @since 2.0
- * @version $Id$
  * @deprecated since 4.1, use {@link MultiValuedMap} instead
  */
 @Deprecated
diff --git a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
index 928a2f9ad..118f7e654 100644
--- a/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.multimap.UnmodifiableMultiValuedMap;
  * </ul>
  *
  * @since 4.1
- * @version $Id$
  */
 public class MultiMapUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/MultiSet.java b/src/main/java/org/apache/commons/collections4/MultiSet.java
index 5a8a262f6..982768f0e 100644
--- a/src/main/java/org/apache/commons/collections4/MultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/MultiSet.java
@@ -30,7 +30,6 @@ import java.util.Set;
  *
  * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id$
  */
 public interface MultiSet<E> extends Collection<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/MultiSetUtils.java b/src/main/java/org/apache/commons/collections4/MultiSetUtils.java
index aa5078e67..ba3c0193c 100644
--- a/src/main/java/org/apache/commons/collections4/MultiSetUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MultiSetUtils.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
  * Provides utility methods and decorators for {@link MultiSet} instances.
  *
  * @since 4.1
- * @version $Id$
  */
 public class MultiSetUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/MultiValuedMap.java b/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
index 679a37cbd..cefe4416b 100644
--- a/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
@@ -43,7 +43,6 @@ import java.util.Set;
  * <p>
  *
  * @since 4.1
- * @version $Id$
  */
 public interface MultiValuedMap<K, V> {
     // Query operations
diff --git a/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
index 4ac89ba67..0af183d8a 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
@@ -27,7 +27,6 @@ package org.apache.commons.collections4;
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id$
  */
 public interface OrderedBidiMap<K, V> extends BidiMap<K, V>, OrderedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/OrderedIterator.java b/src/main/java/org/apache/commons/collections4/OrderedIterator.java
index 64890236e..8cadea567 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedIterator.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id$
  */
 public interface OrderedIterator<E> extends Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/OrderedMap.java b/src/main/java/org/apache/commons/collections4/OrderedMap.java
index 492b7c8f7..57c3e638e 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedMap.java
@@ -24,7 +24,6 @@ package org.apache.commons.collections4;
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id$
  */
 public interface OrderedMap<K, V> extends IterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
index 23c747c63..e3a1977a8 100644
--- a/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
@@ -24,7 +24,6 @@ package org.apache.commons.collections4;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public interface OrderedMapIterator<K, V> extends MapIterator<K, V>, OrderedIterator<K> {
 
diff --git a/src/main/java/org/apache/commons/collections4/Predicate.java b/src/main/java/org/apache/commons/collections4/Predicate.java
index 8d9b272d2..de5434794 100644
--- a/src/main/java/org/apache/commons/collections4/Predicate.java
+++ b/src/main/java/org/apache/commons/collections4/Predicate.java
@@ -31,7 +31,6 @@ package org.apache.commons.collections4;
  * @param <T> the type that the predicate queries
  *
  * @since 1.0
- * @version $Id$
  */
 public interface Predicate<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/PredicateUtils.java b/src/main/java/org/apache/commons/collections4/PredicateUtils.java
index ac2d33130..2243edfe1 100644
--- a/src/main/java/org/apache/commons/collections4/PredicateUtils.java
+++ b/src/main/java/org/apache/commons/collections4/PredicateUtils.java
@@ -67,7 +67,6 @@ import org.apache.commons.collections4.functors.UniquePredicate;
  * All the supplied predicates are Serializable.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicateUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/Put.java b/src/main/java/org/apache/commons/collections4/Put.java
index b99f8b580..438064f33 100644
--- a/src/main/java/org/apache/commons/collections4/Put.java
+++ b/src/main/java/org/apache/commons/collections4/Put.java
@@ -28,7 +28,6 @@ import java.util.Map;
  * {@link Object}.
  *
  * @since 4.0
- * @version $Id$
  *
  * @see Get
  */
diff --git a/src/main/java/org/apache/commons/collections4/QueueUtils.java b/src/main/java/org/apache/commons/collections4/QueueUtils.java
index 7c1d62e97..44b50d873 100644
--- a/src/main/java/org/apache/commons/collections4/QueueUtils.java
+++ b/src/main/java/org/apache/commons/collections4/QueueUtils.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.queue.UnmodifiableQueue;
  * Provides utility methods and decorators for {@link Queue} instances.
  *
  * @since 4.0
- * @version $Id$
  */
 public class QueueUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/ResettableIterator.java b/src/main/java/org/apache/commons/collections4/ResettableIterator.java
index ee6ea54b6..22ef1cbd2 100644
--- a/src/main/java/org/apache/commons/collections4/ResettableIterator.java
+++ b/src/main/java/org/apache/commons/collections4/ResettableIterator.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id$
  */
 public interface ResettableIterator<E> extends Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/ResettableListIterator.java b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java
index da62371d0..5e8b0e7b4 100644
--- a/src/main/java/org/apache/commons/collections4/ResettableListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/ResettableListIterator.java
@@ -25,7 +25,6 @@ import java.util.ListIterator;
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id$
  */
 public interface ResettableListIterator<E> extends ListIterator<E>, ResettableIterator<E>, OrderedIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java
index 3777fe842..e97b9c66c 100644
--- a/src/main/java/org/apache/commons/collections4/SetUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SetUtils.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.set.UnmodifiableSortedSet;
  * {@link Set} and {@link SortedSet} instances.
  *
  * @since 2.1
- * @version $Id$
  */
 public class SetUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/SetValuedMap.java b/src/main/java/org/apache/commons/collections4/SetValuedMap.java
index f56bb2f1f..4b061030f 100644
--- a/src/main/java/org/apache/commons/collections4/SetValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/SetValuedMap.java
@@ -28,7 +28,6 @@ import java.util.Set;
  * </ul>
  *
  * @since 4.1
- * @version $Id$
  */
 public interface SetValuedMap<K, V> extends MultiValuedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/SortedBag.java b/src/main/java/org/apache/commons/collections4/SortedBag.java
index 2f302625c..15c5feb20 100644
--- a/src/main/java/org/apache/commons/collections4/SortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/SortedBag.java
@@ -24,7 +24,6 @@ import java.util.Comparator;
  *
  * @param <E> the type to iterate over
  * @since 2.0
- * @version $Id$
  */
 public interface SortedBag<E> extends Bag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/SortedBidiMap.java b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java
index 364f82f98..8b544c3e3 100644
--- a/src/main/java/org/apache/commons/collections4/SortedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/SortedBidiMap.java
@@ -29,7 +29,6 @@ import java.util.SortedMap;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public interface SortedBidiMap<K, V> extends OrderedBidiMap<K, V>, SortedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
index 3bbc494da..eccbbb681 100644
--- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * and/or {@link Get} but not {@link Map}.
  *
  * @since 4.0
- * @version $Id$
  *
  * @see Get
  * @see Put
diff --git a/src/main/java/org/apache/commons/collections4/Transformer.java b/src/main/java/org/apache/commons/collections4/Transformer.java
index 6068ba7ef..5ee1185a1 100644
--- a/src/main/java/org/apache/commons/collections4/Transformer.java
+++ b/src/main/java/org/apache/commons/collections4/Transformer.java
@@ -33,7 +33,6 @@ package org.apache.commons.collections4;
  * @param <O> the output type from the transformer
  *
  * @since 1.0
- * @version $Id$
  */
 public interface Transformer<I, O> {
 
diff --git a/src/main/java/org/apache/commons/collections4/TransformerUtils.java b/src/main/java/org/apache/commons/collections4/TransformerUtils.java
index 9ecf42616..18c707f67 100644
--- a/src/main/java/org/apache/commons/collections4/TransformerUtils.java
+++ b/src/main/java/org/apache/commons/collections4/TransformerUtils.java
@@ -66,7 +66,6 @@ import org.apache.commons.collections4.functors.SwitchTransformer;
  * </ul>
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformerUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/Trie.java b/src/main/java/org/apache/commons/collections4/Trie.java
index adbdba816..326b7e7a6 100644
--- a/src/main/java/org/apache/commons/collections4/Trie.java
+++ b/src/main/java/org/apache/commons/collections4/Trie.java
@@ -23,7 +23,6 @@ import java.util.SortedMap;
  * more information, see <a href="http://en.wikipedia.org/wiki/Trie">Tries</a>.
  *
  * @since 4.0
- * @version $Id$
  */
 public interface Trie<K, V> extends IterableSortedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/TrieUtils.java b/src/main/java/org/apache/commons/collections4/TrieUtils.java
index 6401844bd..3a6d0382a 100644
--- a/src/main/java/org/apache/commons/collections4/TrieUtils.java
+++ b/src/main/java/org/apache/commons/collections4/TrieUtils.java
@@ -22,7 +22,6 @@ import org.apache.commons.collections4.trie.UnmodifiableTrie;
  * A collection of {@link Trie} utilities.
  *
  * @since 4.0
- * @version $Id$
  */
 public class TrieUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/Unmodifiable.java b/src/main/java/org/apache/commons/collections4/Unmodifiable.java
index 3896c8b8c..ffc04190c 100644
--- a/src/main/java/org/apache/commons/collections4/Unmodifiable.java
+++ b/src/main/java/org/apache/commons/collections4/Unmodifiable.java
@@ -31,7 +31,6 @@ package org.apache.commons.collections4;
  * then the interface won't be there.
  *
  * @since 3.0
- * @version $Id$
  */
 public interface Unmodifiable {
     // marker interface - no methods to implement
diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
index c38a77e35..3c952afb9 100644
--- a/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated bag.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractBagDecorator<E>
         extends AbstractCollectionDecorator<E> implements Bag<E> {
diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
index 859fafc71..0d01270c4 100644
--- a/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * number of occurrences of that element in the bag.
  *
  * @since 3.0 (previously DefaultMapBag v2.0)
- * @version $Id$
  */
 public abstract class AbstractMapBag<E> implements Bag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
index 7b0160314..187fc9574 100644
--- a/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.SortedBag;
  * Methods are forwarded directly to the decorated bag.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedBagDecorator<E>
         extends AbstractBagDecorator<E> implements SortedBag<E> {
diff --git a/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
index be6910a08..5ea08f2ff 100644
--- a/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.Bag;
  * @see Bag
  * @param <E> the type held in the bag
  * @since 4.0
- * @version $Id$
  */
 public final class CollectionBag<E> extends AbstractBagDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
index ea2a9663e..94598343e 100644
--- a/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.SortedBag;
  * Decorates another {@link SortedBag} to comply with the Collection contract.
  *
  * @since 4.0
- * @version $Id$
  */
 public final class CollectionSortedBag<E> extends AbstractSortedBagDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/HashBag.java b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
index 2f5e997d3..9fca8421f 100644
--- a/src/main/java/org/apache/commons/collections4/bag/HashBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
@@ -34,7 +34,6 @@ import java.util.HashMap;
  * {@link Collection} interface specification.
  *
  * @since 3.0 (previously in main package v2.0)
- * @version $Id$
  */
 public class HashBag<E> extends AbstractMapBag<E> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
index 0e6d2dbdd..c79715aaf 100644
--- a/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.collection.PredicatedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedBag<E> extends PredicatedCollection<E> implements Bag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
index 190376190..6524ee578 100644
--- a/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.SortedBag;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedBag<E> extends PredicatedBag<E> implements SortedBag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
index 04e20d180..6e2009b5b 100644
--- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.collection.SynchronizedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SynchronizedBag<E> extends SynchronizedCollection<E> implements Bag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
index fd0a4e17a..6d14ce1bc 100644
--- a/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.SortedBag;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SynchronizedSortedBag<E> extends SynchronizedBag<E> implements SortedBag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
index f1e614646..9298d620b 100644
--- a/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.set.TransformedSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedBag<E> extends TransformedCollection<E> implements Bag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
index feb289167..c723a789c 100644
--- a/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedBag<E> extends TransformedBag<E> implements SortedBag<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/TreeBag.java b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
index f0aeea6d4..084b21cbc 100644
--- a/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.SortedBag;
  * javadoc carefully as several methods violate the {@link Collection} interface specification.
  *
  * @since 3.0 (previously in main package v2.0)
- * @version $Id$
  */
 public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
index a583dbcbf..52fe51ff7 100644
--- a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableBag<E>
         extends AbstractBagDecorator<E> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
index 6761e58ab..7ea2c9468 100644
--- a/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableSortedBag<E>
         extends AbstractSortedBagDecorator<E> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/bag/package-info.java b/src/main/java/org/apache/commons/collections4/bag/package-info.java
index 921cb476d..169ed3d60 100644
--- a/src/main/java/org/apache/commons/collections4/bag/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/bag/package-info.java
@@ -34,6 +34,5 @@
  *   <li>Collection - ensures compliance with the java.util.Collection contract
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.bag;
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
index fad9f058d..14c151eee 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.map.AbstractMapDecorator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractBidiMapDecorator<K, V>
         extends AbstractMapDecorator<K, V> implements BidiMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
index d332a893c..450f29d81 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.keyvalue.AbstractMapEntryDecorator;
  * @see DualHashBidiMap
  * @see DualTreeBidiMap
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
index 7572e1ed0..15b005e44 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.OrderedMapIterator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractOrderedBidiMapDecorator<K, V>
         extends AbstractBidiMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
index 70275eafc..88b148b56 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.SortedBidiMap;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedBidiMapDecorator<K, V>
         extends AbstractOrderedBidiMapDecorator<K, V> implements SortedBidiMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
index e11f553bf..742c5b2f2 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.BidiMap;
  * and the flawed <code>createMap</code> method is ignored.
  *
  * @since 3.0
- * @version $Id$
  */
 public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
index 2f2679385..7374f6daf 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.BidiMap;
  * Two <code>LinkedHashMap</code> instances are used in this class.
  * This provides fast lookups at the expense of storing two sets of map entries and two linked lists.
  *
- * @version $Id$
  * @since 4.0
  */
 public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
index 9e6418ede..18f8dfef0 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
@@ -50,7 +50,6 @@ import org.apache.commons.collections4.map.AbstractSortedMapDecorator;
  * and the flawed <code>createMap</code> method is ignored.
  *
  * @since 3.0
- * @version $Id$
  */
 public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
         implements SortedBidiMap<K, V>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
index b7a9c1d24..1f48b9c73 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
@@ -73,7 +73,6 @@ import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
  * UnsupportedOperationException on attempts to call that method.
  *
  * @since 3.0 (previously DoubleOrderedMap v2.0)
- * @version $Id$
  */
 public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
     implements OrderedBidiMap<K, V>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
index bad687467..4f9052e24 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableBidiMap<K, V>
         extends AbstractBidiMapDecorator<K, V> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
index 581734bd7..a7d2d70bd 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableOrderedBidiMap<K, V>
         extends AbstractOrderedBidiMapDecorator<K, V> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
index 7705718b2..39389d291 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an {@link UnsupportedOperationException}.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableSortedBidiMap<K, V>
         extends AbstractSortedBidiMapDecorator<K, V> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/package-info.java b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java
index 1bf40f71e..6657712d1 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/package-info.java
@@ -36,6 +36,5 @@
  *   <li>Unmodifiable - ensures the map cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.bidimap;
diff --git a/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
index 4d2dede40..95846e21b 100644
--- a/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
@@ -50,7 +50,6 @@ import java.util.Iterator;
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractCollectionDecorator<E>
         implements Collection<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
index 6f2256f05..83b43029e 100644
--- a/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id$
  */
 public class CompositeCollection<E> implements Collection<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
index a0ed46b25..95acfc95a 100644
--- a/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.map.MultiValueMap;
  * @param <C> the type of object in the collection.
  *
  * @since 4.0
- * @version $Id$
  */
 public class IndexedCollection<K, C> extends AbstractCollectionDecorator<C> {
 
diff --git a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
index 468d5fc87..3f14664fa 100644
--- a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.set.PredicatedSet;
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
index 88138ca8b..39d2dafb5 100644
--- a/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
@@ -36,7 +36,6 @@ import java.util.Iterator;
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id$
  */
 public class SynchronizedCollection<E> implements Collection<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
index 1bf13b8b0..c99d662e5 100644
--- a/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.Transformer;
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id$
  */
 public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
index 2704bfa02..2d298ff20 100644
--- a/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableBoundedCollection<E> extends AbstractCollectionDecorator<E>
         implements BoundedCollection<E>, Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
index de9eb3657..abf2984ac 100644
--- a/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableCollection<E>
         extends AbstractCollectionDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/collection/package-info.java b/src/main/java/org/apache/commons/collections4/collection/package-info.java
index e30da0779..fa5e59b54 100644
--- a/src/main/java/org/apache/commons/collections4/collection/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/collection/package-info.java
@@ -31,6 +31,5 @@
  *   <li>Indexed - provides a map-like view onto another collection
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.collection;
diff --git a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
index f0231a0db..9d64a236a 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
@@ -28,7 +28,6 @@ import java.util.Comparator;
  * @see #booleanComparator(boolean)
  *
  * @since 3.0
- * @version $Id$
  */
 public final class BooleanComparator implements Comparator<Boolean>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
index 93551b762..f5a548b5f 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
@@ -36,7 +36,6 @@ import java.util.Comparator;
  * details.
  *
  * @since 2.0
- * @version $Id$
  *
  * @see java.util.Collections#reverseOrder()
  */
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
index 33e123143..408e6118e 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
@@ -45,7 +45,6 @@ import java.util.List;
  * multiple comparisons after all the setup operations are complete.
  *
  * @since 2.0
- * @version $Id$
  */
 public class ComparatorChain<E> implements Comparator<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
index 1b96b34fe..b045c8a4c 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
@@ -44,7 +44,6 @@ import java.util.Map;
  * This class is Serializable from Commons Collections 4.0.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedOrderComparator<T> implements Comparator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
index 2111c3403..9b4aa6f1a 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.ComparatorUtils;
  * other objects.
  *
  * @since 2.0
- * @version $Id$
  */
 public class NullComparator<E> implements Comparator<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
index 459a0fa5e..fdb581d2a 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.ComparatorUtils;
  * to its {@link #compare(Object, Object) compare} method.
  *
  * @since 2.0
- * @version $Id$
  *
  * @see java.util.Collections#reverseOrder()
  */
diff --git a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
index 6d509756d..95a7876d7 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 4.0.
  *
  * @since 2.1
- * @version $Id$
  *
  * @see org.apache.commons.collections4.Transformer
  * @see org.apache.commons.collections4.comparators.ComparableComparator
diff --git a/src/main/java/org/apache/commons/collections4/comparators/package-info.java b/src/main/java/org/apache/commons/collections4/comparators/package-info.java
index c0c690a68..279e765c1 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/package-info.java
@@ -23,6 +23,5 @@
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.comparators;
diff --git a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
index 3fdb0fdd0..d72d831b3 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Abstract base class for quantification predicates, e.g. All, Any, None.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractQuantifierPredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
index aecfbe7c8..e10262e4e 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.Predicate;
  * threw an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
index db080c427..9a388f8a3 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns true if both the predicates return true.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class AndPredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
index 60180bf2f..688b9ac49 100644
--- a/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Predicate;
  * threw an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
index 42a8e0f0b..d4d4b0ba7 100644
--- a/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
@@ -44,7 +44,6 @@ import org.apache.commons.collections4.FunctorException;
  * </pre>
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class CatchAndRethrowClosure<E> implements Closure<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
index ae7930f6a..59e474e24 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Closure;
  * Closure implementation that chains the specified closures together.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ChainedClosure<E> implements Closure<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
index d84fb2462..eba727cc5 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Transformer;
  * is passed to the second transformer and so on.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
index 04a4384cc..707575a58 100644
--- a/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Transformer;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CloneTransformer<T> implements Transformer<T, T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
index 6d1795d9d..8d08ab263 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * and then returns the input.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ClosureTransformer<T> implements Transformer<T, T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
index 4d5474d53..b8e600b99 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
@@ -74,7 +74,6 @@ import org.apache.commons.collections4.Predicate;
  * return <code>true</code> if the comparator returns a value greater than <code>0</code>.</p>
  *
  * @since 4.0
- * @version $Id$
  */
 public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
 
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 367f5abdf..21ea05934 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Factory;
  * use the prototype factory.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ConstantFactory<T> implements Factory<T>, Serializable {
 
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 d10291aea..826a5266c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Transformer;
  * use the prototype factory.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializable {
 
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 4de4f673f..bf265e0a0 100644
--- a/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
+++ b/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Equator;
  *
  * @param <T>  the types of object this {@link Equator} can evaluate.
  * @since 4.0
- * @version $Id$
  */
 public class DefaultEquator<T> implements Equator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
index 041adee52..04b5530ee 100644
--- a/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Predicate;
  * as the one stored in this predicate by equals.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class EqualPredicate<T> implements Predicate<T>, Serializable {
 
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 bca8f6b50..73692980b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.FunctorException;
  * Closure implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class ExceptionClosure<E> implements Closure<E>, Serializable {
 
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 3437ec161..898b2fc90 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.FunctorException;
  * Factory implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class ExceptionFactory<T> implements Factory<T>, Serializable {
 
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 dd6c5852d..5399eaf78 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class ExceptionPredicate<T> implements Predicate<T>, Serializable {
 
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 11fb318ff..f9b55f0ef 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Transformer;
  * Transformer implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
index 4f6d4327b..27325950c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Transformer;
  * Transformer implementation that calls a Factory and returns the result.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable {
 
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 9ba26e6c6..26aaca32e 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that always returns false.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class FalsePredicate<T> implements Predicate<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/ForClosure.java b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
index 20a9e87d5..21e5bb7a3 100644
--- a/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Closure;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ForClosure<E> implements Closure<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
index aed237eea..1efc2d517 100644
--- a/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
+++ b/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * Internal utilities for functors.
  *
  * @since 3.0
- * @version $Id$
  */
 class FunctorUtils {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
index d991b2a57..2687c1499 100644
--- a/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Predicate;
  * as the one stored in this predicate.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class IdentityPredicate<T> implements Predicate<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/IfClosure.java b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
index 99027cda6..26af33779 100644
--- a/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Predicate;
  * based on a predicate.
  *
  * @since 3.0
- * @version $Id$
  */
 public class IfClosure<E> implements Closure<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java b/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java
index f4e60f710..081513c2b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Transformer;
  * @param <O> The output type for the transformer
  *
  * @since 4.1
- * @version $Id$
  */
 public class IfTransformer<I, O> implements Transformer<I, O>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
index 39764102d..0e7d170b7 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Predicate;
  * the type stored in this predicate.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class InstanceofPredicate implements Predicate<Object>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
index 1329afa8b..e739135b6 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.FunctorException;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class InstantiateFactory<T> implements Factory<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
index 6f68600e7..3c0a6a9b7 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.Transformer;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class InstantiateTransformer<T> implements Transformer<Class<? extends T>, T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
index b58509859..718462f3c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.Transformer;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class InvokerTransformer<I, O> implements Transformer<I, O> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
index 9e93ec0ed..7e9b75aa1 100644
--- a/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * using the input parameter as a key.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class MapTransformer<I, O> implements Transformer<I, O>, Serializable {
 
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 e8df5ab3d..96b464cea 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Closure;
  * Closure implementation that does nothing.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NOPClosure<E> implements Closure<E>, Serializable {
 
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 9d223e15d..c2c4f6dfc 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Transformer;
  * Transformer implementation that does nothing.
  *
  * @since 3.0
- * @version $Id$
  */
 public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
index cdbdfa23b..a25222b77 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Predicate;
  * threw an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> {
 
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 5b6c78b18..eab2f670b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns true if the input is not null.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NotNullPredicate<T> implements Predicate<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
index 994512df2..d1436fb8c 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns the opposite of the decorated predicate.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NotPredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
index 18bbf0549..c98a84ee3 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that throws an exception if the input is null.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NullIsExceptionPredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
index a2ca7b2b5..cea59fd66 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns false if the input is null.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NullIsFalsePredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
index 626c3b65d..994faaf74 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns true if the input is null.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NullIsTruePredicate<T> implements PredicateDecorator<T>, Serializable {
 
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 993e8ef19..1609c37d0 100644
--- a/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns true if the input is null.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class NullPredicate<T> implements Predicate<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
index 975cb5b39..0423fab06 100644
--- a/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Predicate;
  * threw an exception.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
index 18c0a0fd3..511d459db 100644
--- a/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that returns true if either of the predicates return true.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class OrPredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
index ed0397365..a88dcd23b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * This interface enables tools to access the decorated predicates.
  *
  * @since 3.1
- * @version $Id$
  */
 public interface PredicateDecorator<T> extends Predicate<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
index c20970ccd..3c4153479 100644
--- a/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * and then returns the result.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicateTransformer<T> implements Transformer<T, Boolean>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
index 199f96b66..64173d2b7 100644
--- a/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
+++ b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.FunctorException;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PrototypeFactory {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
index 18acda47b..46e903366 100644
--- a/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Transformer;
  * <code>String.valueOf</code> on the input object.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class StringValueTransformer<T> implements Transformer<T, String>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
index 48f4a4efb..4a063eb05 100644
--- a/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Predicate;
  * like a switch statement.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SwitchClosure<E> implements Closure<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
index 93a258731..21e93da8e 100644
--- a/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Transformer;
  * like a switch statement.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
index 155c06996..ed4e95017 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * another <code>Predicate</code>.
  *
  * @since 3.1
- * @version $Id$
  */
 public final class TransformedPredicate<T> implements PredicateDecorator<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
index d072d173c..31cc738ff 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * and ignore the result.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformerClosure<E> implements Closure<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
index becefb43b..e5c66b5e0 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Transformer;
  * Predicate implementation that returns the result of a transformer.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class TransformerPredicate<T> implements Predicate<T>, Serializable {
 
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 58b6a0eb3..a04b334ce 100644
--- a/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Predicate;
  * Predicate implementation that always returns true.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class TruePredicate<T> implements Predicate<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
index 18009ad71..58009634b 100644
--- a/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
+++ b/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Predicate;
  * passed into the predicate.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UniquePredicate<T> implements Predicate<T>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
index c3c0ecb52..24ddd0cc0 100644
--- a/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
+++ b/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Predicate;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class WhileClosure<E> implements Closure<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/functors/package-info.java b/src/main/java/org/apache/commons/collections4/functors/package-info.java
index c30ba19b7..79663cb8d 100644
--- a/src/main/java/org/apache/commons/collections4/functors/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/functors/package-info.java
@@ -38,6 +38,5 @@
  * <li>WhileClosure</li>
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.functors;
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
index b6ee3916e..daac30580 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
@@ -22,7 +22,6 @@ import java.util.NoSuchElementException;
  * Provides an implementation of an empty iterator.
  *
  * @since 3.1
- * @version $Id$
  */
 abstract class AbstractEmptyIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
index fd697ea2a..8705c3dab 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
@@ -20,7 +20,6 @@ package org.apache.commons.collections4.iterators;
  * Provides an implementation of an empty map iterator.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractEmptyMapIterator<K, V> extends AbstractEmptyIterator<K> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
index 8f2e6bc51..e7208a892 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
  * All methods are forwarded to the decorated iterator.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractIteratorDecorator<E> extends AbstractUntypedIteratorDecorator<E, E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
index cefe7c73f..70db4beb5 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
@@ -24,7 +24,6 @@ import java.util.ListIterator;
  * All methods are forwarded to the decorated list iterator.
  *
  * @since 3.0
- * @version $Id$
  */
 public class AbstractListIteratorDecorator<E> implements ListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
index 13343e8a6..419aa9151 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.MapIterator;
  * All methods are forwarded to the decorated map iterator.
  *
  * @since 3.0
- * @version $Id$
  */
 public class AbstractMapIteratorDecorator<K, V> implements MapIterator<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
index c934f460f..5ec24fe82 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.OrderedMapIterator;
  * All methods are forwarded to the decorated map iterator.
  *
  * @since 3.0
- * @version $Id$
  */
 public class AbstractOrderedMapIteratorDecorator<K, V> implements OrderedMapIterator<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
index 200e7b77d..1f99197fd 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
  * All methods are forwarded to the decorated iterator.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator<O> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
index a6e7831d3..e1b4c58a0 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.ResettableIterator;
  *
  * @param <E> the type of elements returned by this iterator
  * @since 1.0
- * @version $Id$
  */
 public class ArrayIterator<E> implements ResettableIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
index e6743cec9..071ffaf48 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Id$
  */
 public class ArrayListIterator<E> extends ArrayIterator<E>
         implements ResettableListIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java b/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java
index 06aaeff87..143e75cb9 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java
@@ -29,7 +29,6 @@ import java.util.NoSuchElementException;
  * before that position.
  *
  * @since 4.1
- * @version $Id$
  */
 public class BoundedIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
index 4ff1c94bc..af1750308 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * lesser of <code>A.next()</code> and <code>B.next()</code>.
  *
  * @since 2.1
- * @version $Id$
  */
 public class CollatingIterator<E> implements Iterator<E> {
 
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 3d1ee3656..1ba2f886b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
  *
  * @since 2.1.1 and 3.1
- * @version $Id$
  */
 public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements ResettableIterator<E> {
 
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 909afa07e..92c431c35 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * due to issues with <code>IteratorUtils</code>.
  *
  * @since 2.1.1 and 3.1
- * @version $Id$
  */
 public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
         ResettableListIterator<E> {
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 813d58292..3b97508fd 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Provides an implementation of an empty map iterator.
  *
  * @since 3.1
- * @version $Id$
  */
 public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> implements
         MapIterator<K, V>, ResettableIterator<K> {
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 bfc292984..ff9d386c4 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Provides an implementation of an empty ordered iterator.
  *
  * @since 3.1
- * @version $Id$
  */
 public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E>
         implements OrderedIterator<E>, ResettableIterator<E> {
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 dc5654e20..598c77a7b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Provides an implementation of an empty ordered map iterator.
  *
  * @since 3.1
- * @version $Id$
  */
 public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V>
         implements OrderedMapIterator<K, V>, ResettableIterator<K> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
index 7a17f6c94..ecc9eb83f 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * </pre>
  *
  * @since 3.0
- * @version $Id$
  */
 public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
index 4933eaef5..fa0449e0e 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
  * to be {@link Iterator Iterator} instances.
  *
  * @since 1.0
- * @version $Id$
  */
 public class EnumerationIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
index 17695573f..457430d4c 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Predicate;
  * those elements that match the specified {@link Predicate Predicate}.
  *
  * @since 1.0
- * @version $Id$
  */
 public class FilterIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
index 15e513eff..370dbb559 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Predicate;
  * those elements that match the specified {@link Predicate Predicate}.
  *
  * @since 2.0
- * @version $Id$
  */
 public class FilterListIterator<E> implements ListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
index 5db1c076a..e5a8140fe 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
@@ -46,7 +46,6 @@ import java.util.Queue;
  * the queue.
  *
  * @since 2.1
- * @version $Id$
  */
 public class IteratorChain<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
index 5ee573bc5..0b35289f2 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
  * {@link Enumeration Enumeration} instance.
  *
  * @since 1.0
- * @version $Id$
  */
 public class IteratorEnumeration<E> implements Enumeration<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
index 59c6eddf5..364bef301 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
@@ -61,7 +61,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * </pre>
  *
  * @since 4.0
- * @version $Id$
  */
 public class IteratorIterable<E> implements Iterable<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
index f7fe0235e..733a696b4 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
@@ -44,7 +44,6 @@ import java.util.Iterator;
  * function as an empty iterator.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class LazyIteratorChain<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
index 3468011fd..6f844a818 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * This class implements ResettableListIterator from Commons Collections 3.2.
  *
  * @since 2.1
- * @version $Id$
  */
 public class ListIteratorWrapper<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
index 58720c82f..34d328efd 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * implementations will throw a ConcurrentModificationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LoopingIterator<E> implements ResettableIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
index f07923845..0224764ff 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * ConcurrentModificationException.
  *
  * @since 3.2
- * @version $Id$
  */
 public class LoopingListIterator<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
index ea37d5e4f..a76c1a29e 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
@@ -28,7 +28,6 @@ import org.w3c.dom.NodeList;
  * removal of items.
  *
  * @since 4.0
- * @version $Id$
  * @see NodeList
  */
 public class NodeListIterator implements Iterator<Node> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
index 6163e0f9d..055fafe97 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.ResettableIterator;
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id$
  */
 public class ObjectArrayIterator<E> implements ResettableIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
index c6196efa0..db4604553 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Id$
  */
 public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
         implements ResettableListIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
index b3afc0be0..162f170e0 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
@@ -72,7 +72,6 @@ import org.apache.commons.collections4.Transformer;
  * more efficient (and convenient) than using nested for loops to extract a list.
  *
  * @since 3.1
- * @version $Id$
  */
 public class ObjectGraphIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
index e6a2d89da..94cd2c389 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
@@ -28,7 +28,6 @@ import java.util.NoSuchElementException;
  * {@link #peek()} or {@link #element()}.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PeekingIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
index cbb5c33dd..494e79cfc 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
@@ -38,7 +38,6 @@ import java.util.NoSuchElementException;
  *
  * @param <E>  the type of the objects being permuted
  *
- * @version $Id$
  * @since 4.0
  */
 public class PermutationIterator<E> implements Iterator<List<E>> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
index fdc1eb683..031153b82 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
@@ -31,7 +31,6 @@ import java.util.Iterator;
  * result in an {@link UnsupportedOperationException}.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PushbackIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
index d5f192af1..4025de895 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * continues. The previous methods work similarly.
  *
  * @since 3.2
- * @version $Id$
  */
 public class ReverseListIterator<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
index 2941a8143..451d49066 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * object instance.
  *
  * @since 2.0
- * @version $Id$
  */
 public class SingletonIterator<E>
         implements ResettableIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
index 736132ee6..c554bf490 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * object instance.
  *
  * @since 2.1
- * @version $Id$
  */
 public class SingletonListIterator<E> implements ResettableListIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
index 656b0447d..45710e5d8 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
  * before that position.
  *
  * @since 4.1
- * @version $Id$
  */
 public class SkippingIterator<E> extends AbstractIteratorDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
index 09efade59..e930c050b 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.Transformer;
  * Decorates an iterator such that each element returned is transformed.
  *
  * @since 1.0
- * @version $Id$
  */
 public class TransformIterator<I, O> implements Iterator<O> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
index 72c537361..f95c31ca2 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.functors.UniquePredicate;
  * and duplicate Objects are skipped.
  *
  * @since 2.1
- * @version $Id$
  */
 public class UniqueFilterIterator<E> extends FilterIterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
index 4f7eb6369..03ef31ffc 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableIterator<E> implements Iterator<E>, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
index 8b104177c..b02cb6d46 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
index 0b4d926b1..12d1ca1b9 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableMapIterator<K, V> implements MapIterator<K, V>, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
index 34b5711ab..b67188016 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableOrderedMapIterator<K, V> implements OrderedMapIterator<K, V>,
         Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
index 6b05872cd..6bdf20aca 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.FluentIterable;
  * and {@code B.next()} until both iterators are exhausted.
  *
  * @since 4.1
- * @version $Id$
  */
 public class ZippingIterator<E> implements Iterator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/iterators/package-info.java b/src/main/java/org/apache/commons/collections4/iterators/package-info.java
index 0438c0279..4fd4037ee 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/package-info.java
@@ -23,6 +23,5 @@
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.iterators;
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
index f8e332968..f8165613c 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.KeyValue;
  * and {@link java.util.Map.Entry Map.Entry} implementations.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
index 94adb0789..518293099 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
@@ -23,7 +23,6 @@ import java.util.Map;
  * {@link java.util.Map.Entry Map.Entry} implementations.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapEntry<K, V> extends AbstractKeyValue<K, V> implements Map.Entry<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
index dc7def205..713ee8bec 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.KeyValue;
  * added to a {@link java.util.Map.Entry Map.Entry}.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V>, KeyValue<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
index 99b46f6ed..28d8ac5ea 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.KeyValue;
  * itself as a key or value.
  *
  * @since 3.0
- * @version $Id$
  */
 public class DefaultKeyValue<K, V> extends AbstractKeyValue<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
index b28527f24..a1c8539dd 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.KeyValue;
  * the {@link java.util.Map.Entry Map.Entry} contract from being broken.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class DefaultMapEntry<K, V> extends AbstractMapEntry<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
index 2b08d8a73..430260d3c 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
@@ -40,7 +40,6 @@ import java.util.Arrays;
  * </pre>
  *
  * @since 3.0
- * @version $Id$
  */
 public class MultiKey<K> implements Serializable {
     // This class could implement List, but that would confuse it's purpose
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
index 613d3f36b..b2d1898d7 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.KeyValue;
  * map, however this will probably mess up any iterators.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
index 74be0d06b..2bc302782 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * UnsupportedOperationException when <code>setValue</code> is called.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableMapEntry<K, V> extends AbstractMapEntry<K, V> implements Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
index 2e20d639b..a81b08ca2 100644
--- a/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
@@ -25,6 +25,5 @@
  *   <li>MultiKey - a holder of multiple keys tied together
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.keyvalue;
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
index 9fdc2efc2..50c3e12bd 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.OrderedIterator;
  * is here.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractLinkedList<E> implements List<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
index bef23bfa7..e72b64509 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  *
  * @param <E> the type of the elements in the list
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractListDecorator<E> extends AbstractCollectionDecorator<E>
         implements List<E> {
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
index 61dc970b5..3fc24d416 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
@@ -26,7 +26,6 @@ import java.util.List;
  * Serializable subclass of AbstractListDecorator.
  *
  * @since 3.1
- * @version $Id$
  */
 public abstract class AbstractSerializableListDecorator<E>
         extends AbstractListDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
index 46c504e17..e94847586 100644
--- a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
@@ -53,7 +53,6 @@ import java.util.ListIterator;
  *
  * @see java.util.LinkedList
  * @since 1.0
- * @version $Id$
  */
 public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
index d397019c3..56fda3a7b 100644
--- a/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeList<E>
         extends AbstractSerializableListDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
index 10ce036d8..b81802e0c 100644
--- a/src/main/java/org/apache/commons/collections4/list/GrowthList.java
+++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
@@ -50,7 +50,6 @@ import java.util.List;
  *
  * @see LazyList
  * @since 3.2
- * @version $Id$
  */
 public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/LazyList.java b/src/main/java/org/apache/commons/collections4/list/LazyList.java
index 22f6b047b..31e70fc33 100644
--- a/src/main/java/org/apache/commons/collections4/list/LazyList.java
+++ b/src/main/java/org/apache/commons/collections4/list/LazyList.java
@@ -55,7 +55,6 @@ import org.apache.commons.collections4.Factory;
  *
  * @see GrowthList
  * @since 3.0
- * @version $Id$
  */
 public class LazyList<E> extends AbstractSerializableListDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
index bb5fd2cd0..71e8630d7 100644
--- a/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
@@ -37,7 +37,6 @@ import java.util.Collection;
  * <b>Note that this implementation is not synchronized.</b>
  *
  * @since 3.0
- * @version $Id$
  */
 public class NodeCachingLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/PredicatedList.java b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
index 0501d9e02..45d2caa2c 100644
--- a/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedList<E> extends PredicatedCollection<E> implements List<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
index f1e3bb6ae..3291145b3 100644
--- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
@@ -46,7 +46,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/TransformedList.java b/src/main/java/org/apache/commons/collections4/list/TransformedList.java
index 9c2de739d..85306a123 100644
--- a/src/main/java/org/apache/commons/collections4/list/TransformedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TransformedList.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.iterators.AbstractListIteratorDecorator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedList<E> extends TransformedCollection<E> implements List<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/list/TreeList.java b/src/main/java/org/apache/commons/collections4/list/TreeList.java
index 77285c6e6..feffa1c4a 100644
--- a/src/main/java/org/apache/commons/collections4/list/TreeList.java
+++ b/src/main/java/org/apache/commons/collections4/list/TreeList.java
@@ -53,7 +53,6 @@ import org.apache.commons.collections4.OrderedIterator;
  * does use slightly more memory.
  *
  * @since 3.1
- * @version $Id$
  */
 public class TreeList<E> extends AbstractList<E> {
 //    add; toArray; iterator; insert; get; indexOf; remove
diff --git a/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
index c23e4e6dd..be496c174 100644
--- a/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
+++ b/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableList<E>
         extends AbstractSerializableListDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/list/package-info.java b/src/main/java/org/apache/commons/collections4/list/package-info.java
index 7ac1cae0d..91c0121ba 100644
--- a/src/main/java/org/apache/commons/collections4/list/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/list/package-info.java
@@ -35,6 +35,5 @@
  *   <li>SetUnique - a list that avoids duplicate entries like a Set</li>
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.list;
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
index 78ee18e7e..1b91f3976 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
@@ -53,7 +53,6 @@ import org.apache.commons.collections4.iterators.EmptyMapIterator;
  * This extends clause will be removed in v5.0.
  *
  * @since 3.0
- * @version $Id$
  */
 public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements IterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
index 0ba6d6eec..45028cede 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.set.AbstractSetDecorator;
  * </p>
  *
  * @since 3.1
- * @version $Id$
  */
 abstract class AbstractInputCheckedMapDecorator<K, V>
         extends AbstractMapDecorator<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
index 2927fff62..2fd1739c2 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.MapIterator;
  * Provide a basic {@link IterableMap} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractIterableMap<K, V> implements IterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
index 0d6967ee8..1595a089a 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
@@ -57,7 +57,6 @@ import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
  * methods exposed.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> implements OrderedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
index 1939bada3..1599418f3 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
@@ -36,7 +36,6 @@ import java.util.Set;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
index 6c06d2fc6..568c1bca5 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.OrderedMapIterator;
  * But, you might want that loophole, so this class is kept simple.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractOrderedMapDecorator<K, V> extends AbstractMapDecorator<K, V>
         implements OrderedMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index 5cbd87b77..9ccd7e5be 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -77,7 +77,6 @@ import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
  *
  * @see java.lang.ref.Reference
  * @since 3.1 (extracted from ReferenceMap in 3.0)
- * @version $Id$
  */
 public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
index 1cb568f20..a0f601899 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
@@ -42,7 +42,6 @@ import org.apache.commons.collections4.iterators.ListIteratorWrapper;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecorator<K, V> implements
         IterableSortedMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
index 176f6f3dc..334016c21 100644
--- a/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
@@ -60,7 +60,6 @@ import java.util.Map;
  * </p>
  *
  * @since 3.0
- * @version $Id$
  */
 public class CaseInsensitiveMap<K, V> extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
index 5f53bef10..df19db91e 100644
--- a/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.collection.CompositeCollection;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index faddcdf78..89b4b776a 100644
--- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -57,7 +57,6 @@ import org.apache.commons.collections4.functors.FactoryTransformer;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.2
- * @version $Id$
  *
  * @see LazyMap
  */
diff --git a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
index d100a40d0..8b4cbe585 100644
--- a/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
+++ b/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Adapts a Map entrySet to the MapIterator interface.
  *
  * @since 4.0
- * @version $Id$
  */
 public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
index b909aef70..7322d12c0 100644
--- a/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
@@ -50,7 +50,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeMap<K, V>
         extends AbstractMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
index f57e8e9d7..9b7c06e5f 100644
--- a/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
@@ -52,7 +52,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeSortedMap<K, V>
         extends AbstractSortedMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
index dcce62a7e..c93e60179 100644
--- a/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
+++ b/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
@@ -68,7 +68,6 @@ import org.apache.commons.collections4.iterators.EmptyMapIterator;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/HashedMap.java b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
index 9c66adcb2..06353e4ff 100644
--- a/src/main/java/org/apache/commons/collections4/map/HashedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/HashedMap.java
@@ -37,7 +37,6 @@ import java.util.Map;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class HashedMap<K, V>
         extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
diff --git a/src/main/java/org/apache/commons/collections4/map/LRUMap.java b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
index e05d26df9..d03754a0d 100644
--- a/src/main/java/org/apache/commons/collections4/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LRUMap.java
@@ -55,7 +55,6 @@ import org.apache.commons.collections4.BoundedMap;
  * <code>NullPointerException</code>'s when accessed by concurrent threads.
  *
  * @since 3.0 (previously in main package v1.0)
- * @version $Id$
  */
 public class LRUMap<K, V>
         extends AbstractLinkedMap<K, V> implements BoundedMap<K, V>, Serializable, Cloneable {
diff --git a/src/main/java/org/apache/commons/collections4/map/LazyMap.java b/src/main/java/org/apache/commons/collections4/map/LazyMap.java
index b46a156da..51d933b8d 100644
--- a/src/main/java/org/apache/commons/collections4/map/LazyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LazyMap.java
@@ -57,7 +57,6 @@ import org.apache.commons.collections4.functors.FactoryTransformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
index ddaf9b682..a706c1b70 100644
--- a/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LazySortedMap<K,V> extends LazyMap<K,V> implements SortedMap<K,V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
index 6c5db902c..3e73b7745 100644
--- a/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
@@ -58,7 +58,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 3.0
- * @version $Id$
  */
 public class LinkedMap<K, V> extends AbstractLinkedMap<K, V> implements Serializable, Cloneable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
index b8de298fd..34bd0bd44 100644
--- a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
@@ -73,7 +73,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * This class is {@link Serializable} starting with Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ListOrderedMap<K, V>
         extends AbstractMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
index 093e74f72..960a3ba48 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
@@ -72,7 +72,6 @@ import org.apache.commons.collections4.keyvalue.MultiKey;
  * by concurrent threads without synchronization.
  *
  * @since 3.1
- * @version $Id$
  */
 public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K>, V>
         implements Serializable, Cloneable {
diff --git a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
index 7d4ee9af1..5ff05cab5 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
@@ -60,7 +60,6 @@ import org.apache.commons.collections4.iterators.TransformIterator;
  * by concurrent threads without synchronization.
  *
  * @since 3.2
- * @version $Id$
  * @deprecated since 4.1, use {@link org.apache.commons.collections4.MultiValuedMap MultiValuedMap} instead
  */
 @Deprecated
diff --git a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index 8ba588a90..32d2af053 100644
--- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -58,7 +58,6 @@ import java.util.concurrent.TimeUnit;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 4.0
- * @version $Id$
  */
 public class PassiveExpiringMap<K, V>
     extends AbstractMapDecorator<K, V>
@@ -72,7 +71,6 @@ public class PassiveExpiringMap<K, V>
      * @param <K> the type of the keys in the map
      * @param <V> the type of the values in the map
      * @since 4.0
-     * @version $Id$
      */
     public static class ConstantTimeToLiveExpirationPolicy<K, V>
         implements ExpirationPolicy<K, V> {
@@ -160,7 +158,6 @@ public class PassiveExpiringMap<K, V>
      * @param <K> the key object type.
      * @param <V> the value object type
      * @since 4.0
-     * @version $Id$
      */
     public static interface ExpirationPolicy<K, V>
         extends Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
index b8fd06e9e..abcd11d8e 100644
--- a/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
@@ -45,7 +45,6 @@ import org.apache.commons.collections4.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedMap<K, V>
         extends AbstractInputCheckedMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
index 935654ee7..a2abd53b6 100644
--- a/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
@@ -46,7 +46,6 @@ import org.apache.commons.collections4.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedMap<K, V> extends PredicatedMap<K, V> implements SortedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
index 8eafcd2e1..270854d87 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
@@ -73,7 +73,6 @@ import java.lang.ref.Reference;
  * @see java.lang.ref.Reference
  *
  * @since 3.0 (previously in main package v2.1)
- * @version $Id$
  */
 public class ReferenceIdentityMap<K, V> extends AbstractReferenceMap<K, V> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
index 66f919ea2..aa82ff99e 100644
--- a/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
@@ -68,7 +68,6 @@ import java.io.Serializable;
  * @see java.lang.ref.Reference
  *
  * @since 3.0 (previously in main package v2.1)
- * @version $Id$
  */
 public class ReferenceMap<K, V> extends AbstractReferenceMap<K, V> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/SingletonMap.java b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
index ff8373718..59fc61585 100644
--- a/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.keyvalue.TiedMapEntry;
  * </ul>
  *
  * @since 3.1
- * @version $Id$
  */
 public class SingletonMap<K, V>
         implements OrderedMap<K, V>, BoundedMap<K, V>, KeyValue<K, V>, Serializable, Cloneable {
diff --git a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
index a62197d8e..9915bbd0c 100644
--- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
@@ -91,7 +91,6 @@ import org.apache.commons.collections4.KeyValue;
  * operations will affect the map.<p>
  *
  * @since 3.0 (previously in main package v2.1)
- * @version $Id$
  */
 public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/map/TransformedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
index c8715a3d2..fcd8287bc 100644
--- a/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
@@ -43,7 +43,6 @@ import org.apache.commons.collections4.Transformer;
  * @see org.apache.commons.collections4.splitmap.TransformedSplitMap
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedMap<K, V>
         extends AbstractInputCheckedMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
index 04273a365..34a0082cc 100644
--- a/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedMap<K, V>
         extends TransformedMap<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
index 088f1f85a..82a46b6f5 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.set.AbstractSetDecorator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableEntrySet<K, V>
         extends AbstractSetDecorator<Map.Entry<K, V>> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
index 1348aa6bb..02378b684 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableMap<K, V>
         extends AbstractMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
index 4d5d23bce..d16860374 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecorator<K, V> implements
         Unmodifiable, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
index cafa29399..a49e85636 100644
--- a/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableSortedMap<K, V>
         extends AbstractSortedMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections4/map/package-info.java b/src/main/java/org/apache/commons/collections4/map/package-info.java
index 7407697ab..e2be5cf84 100644
--- a/src/main/java/org/apache/commons/collections4/map/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/map/package-info.java
@@ -49,7 +49,6 @@
  *   <li>ListOrdered - ensures that insertion order is retained
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.map;
 
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
index aafd84737..8904f6c18 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.ListValuedMap;
  * the List implementation to use as values.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap<K, V>
         implements ListValuedMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
index f4c97fbec..620667b59 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
@@ -52,7 +52,6 @@ import org.apache.commons.collections4.multiset.UnmodifiableMultiSet;
  * Subclasses specify a Map implementation to use as the internal storage.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
index ff520caa4..d49e7a019 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * @param <V> the type of value elements
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiValuedMapDecorator<K, V>
         implements MultiValuedMap<K, V>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
index eb0b2b17f..96c314070 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.SetValuedMap;
  * the Set implementation to use as values.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap<K, V>
     implements SetValuedMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
index dfaf13bef..873dccffa 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 4.1
- * @version $Id$
  */
 public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
     implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
index a1ad0a967..b06ada847 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * exceptions when accessed by concurrent threads without synchronization.
  *
  * @since 4.1
- * @version $Id$
  */
 public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
     implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
index acef611f9..ed1e17af1 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.Transformer;
  * <strong>Note that TransformedMultiValuedMap is not synchronized and is not thread-safe.</strong>
  *
  * @since 4.1
- * @version $Id$
  */
 public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecorator<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
index 2370b1adb..1bd629f09 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
@@ -40,7 +40,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * @param <V> the type of value elements
  *
  * @since 4.1
- * @version $Id$
  */
 public final class UnmodifiableMultiValuedMap<K, V>
         extends AbstractMultiValuedMapDecorator<K, V> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/multimap/package-info.java b/src/main/java/org/apache/commons/collections4/multimap/package-info.java
index 030d3fe17..a98923442 100644
--- a/src/main/java/org/apache/commons/collections4/multimap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/multimap/package-info.java
@@ -30,6 +30,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.multimap;
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
index d0f22cf95..f74285440 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
@@ -36,7 +36,6 @@ import org.apache.commons.collections4.iterators.AbstractIteratorDecorator;
  * number of occurrences of that element in the multiset.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
index 22191af57..261175fd2 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.Transformer;
  * creation of subclass implementations.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implements MultiSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
index d504cb203..4c80eb555 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated multiset.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiSetDecorator<E>
         extends AbstractCollectionDecorator<E> implements MultiSet<E> {
diff --git a/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
index 73ccf0799..0c1984838 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
@@ -32,7 +32,6 @@ import java.util.HashMap;
  * of an object to be added or removed at once.
  *
  * @since 4.1
- * @version $Id$
  */
 public class HashMultiSet<E> extends AbstractMapMultiSet<E> implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
index 420677ae7..b5d1b7e9f 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.collection.PredicatedCollection;
  * </pre>
  *
  * @since 4.1
- * @version $Id$
  */
 public class PredicatedMultiSet<E> extends PredicatedCollection<E> implements MultiSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
index 33ca71045..f06972027 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.SynchronizedCollection;
  * Iterators must be separately synchronized around the loop.
  *
  * @since 4.1
- * @version $Id$
  */
 public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implements MultiSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
index bd297b09b..ddfadc058 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.set.UnmodifiableSet;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 4.1
- * @version $Id$
  */
 public final class UnmodifiableMultiSet<E>
         extends AbstractMultiSetDecorator<E> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections4/multiset/package-info.java b/src/main/java/org/apache/commons/collections4/multiset/package-info.java
index 40378a10c..014a00330 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/package-info.java
@@ -31,6 +31,5 @@
  *   <li>Unmodifiable - ensures the multiset cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.multiset;
diff --git a/src/main/java/org/apache/commons/collections4/package-info.java b/src/main/java/org/apache/commons/collections4/package-info.java
index d7229f522..2608ea23a 100644
--- a/src/main/java/org/apache/commons/collections4/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/package-info.java
@@ -22,6 +22,5 @@
  *   <li>ArrayStack - a non synchronized Stack that follows the same API as {@code java.util Stack}
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4;
diff --git a/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
index 380175769..ba8b58794 100644
--- a/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  *
  * @param <E> the type of the elements in the queue
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractQueueDecorator<E> extends AbstractCollectionDecorator<E>
         implements Queue<E> {
diff --git a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
index 3b098b32d..8beb531ef 100644
--- a/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
@@ -44,7 +44,6 @@ import org.apache.commons.collections4.BoundedCollection;
  * This queue prevents null objects from being added.
  *
  * @since 4.0
- * @version $Id$
  */
 public class CircularFifoQueue<E> extends AbstractCollection<E>
     implements Queue<E>, BoundedCollection<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
index 507ab59e0..016b95dae 100644
--- a/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.PredicatedCollection;
  * <pre>Queue queue = PredicatedQueue.predicatedQueue(new UnboundedFifoQueue(), NotNullPredicate.INSTANCE);</pre>
  *
  * @since 4.0
- * @version $Id$
  */
 public class PredicatedQueue<E> extends PredicatedCollection<E> implements Queue<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
index b2ac4dfbe..b42366c59 100644
--- a/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.TransformedCollection;
  * use the Integer form to remove objects.
  *
  * @since 4.0
- * @version $Id$
  */
 public class TransformedQueue<E> extends TransformedCollection<E> implements Queue<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
index 5c8384be4..309aaac6a 100644
--- a/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
+++ b/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 4.0
- * @version $Id$
  */
 public final class UnmodifiableQueue<E>
         extends AbstractQueueDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/queue/package-info.java b/src/main/java/org/apache/commons/collections4/queue/package-info.java
index 18eb9c399..7aa4232bc 100644
--- a/src/main/java/org/apache/commons/collections4/queue/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/queue/package-info.java
@@ -29,6 +29,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.queue;
diff --git a/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java b/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java
index 6eda1ad64..e416e7ec6 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java
@@ -115,7 +115,6 @@ package org.apache.commons.collections4.sequence;
  * </pre>
  *
  * @since 4.0
- * @version $Id$
  */
 public interface CommandVisitor<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java b/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java
index 6d995833b..7ec09fbfb 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java
@@ -29,7 +29,6 @@ package org.apache.commons.collections4.sequence;
  * @see EditScript
  *
  * @since 4.0
- * @version $Id$
  */
 public class DeleteCommand<T> extends EditCommand<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java b/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
index 9e758f82c..4c339ac24 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
@@ -43,7 +43,6 @@ package org.apache.commons.collections4.sequence;
  * @see EditScript
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class EditCommand<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/EditScript.java b/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
index 9e4bbe966..e68e0590f 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
@@ -41,7 +41,6 @@ import java.util.List;
  * @see ReplacementsHandler
  *
  * @since 4.0
- * @version $Id$
  */
 public class EditScript<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java b/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java
index facde5884..159f8b133 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java
@@ -29,7 +29,6 @@ package org.apache.commons.collections4.sequence;
  * @see EditScript
  *
  * @since 4.0
- * @version $Id$
  */
 public class InsertCommand<T> extends EditCommand<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java b/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java
index 18569d71d..a95d8c3e7 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java
@@ -29,7 +29,6 @@ package org.apache.commons.collections4.sequence;
  * @see EditScript
  *
  * @since 4.0
- * @version $Id$
  */
 public class KeepCommand<T> extends EditCommand<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
index d9e820115..fc9176771 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
@@ -46,7 +46,6 @@ import java.util.List;
  * @see SequencesComparator
  *
  * @since 4.0
- * @version $Id$
  */
 public class ReplacementsFinder<T> implements CommandVisitor<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java
index 12cd05ff6..4c4a8c0a3 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java
@@ -23,7 +23,6 @@ import java.util.List;
  *
  * @see ReplacementsFinder
  * @since 4.0
- * @version $Id$
  */
 public interface ReplacementsHandler<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
index 908faf885..6228b85b8 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.functors.DefaultEquator;
  * @see CommandVisitor
  *
  * @since 4.0
- * @version $Id$
  */
 public class SequencesComparator<T> {
 
diff --git a/src/main/java/org/apache/commons/collections4/sequence/package-info.java b/src/main/java/org/apache/commons/collections4/sequence/package-info.java
index 6e12a28db..796298c93 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/package-info.java
@@ -72,6 +72,5 @@
  * method is also provided. This allows the user to keep track of the current index in
  * both arrays if he needs so.
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.sequence;
diff --git a/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
index e4a337cc4..01ff705a7 100644
--- a/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
@@ -26,7 +26,6 @@ import java.util.NavigableSet;
  *
  * @param <E> the type of the elements in the navigable set
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractNavigableSetDecorator<E>
         extends AbstractSortedSetDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
index ca4c69d6c..29c6bc12a 100644
--- a/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
@@ -26,7 +26,6 @@ import java.util.Set;
  * Serializable subclass of AbstractSetDecorator.
  *
  * @since 3.1
- * @version $Id$
  */
 public abstract class AbstractSerializableSetDecorator<E>
         extends AbstractSetDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
index e616623e1..1dc1ae768 100644
--- a/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionDecorator;
  *
  * @param <E> the type of the elements in the set
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSetDecorator<E> extends AbstractCollectionDecorator<E> implements
         Set<E> {
diff --git a/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
index f3123abbe..bf5f9dc25 100644
--- a/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
@@ -27,7 +27,6 @@ import java.util.SortedSet;
  *
  * @param <E> the type of the elements in the sorted set
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedSetDecorator<E>
         extends AbstractSetDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
index b71191835..104a179c6 100644
--- a/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
@@ -44,7 +44,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CompositeSet<E> implements Set<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
index 80fea7602..65f7184a8 100644
--- a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
@@ -50,7 +50,6 @@ import org.apache.commons.collections4.list.UnmodifiableList;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ListOrderedSet<E>
     extends AbstractSerializableSetDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
index 1b5c5499f..88f1900bb 100644
--- a/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
@@ -33,7 +33,6 @@ import java.util.Set;
  * Exceptions include <code>BidiMap</code> implementations, as they require unique values.
  *
  * @since 3.1
- * @version $Id$
  */
 public final class MapBackedSet<E, V> implements Set<E>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java
index 8fd2b3b7c..3411ceb16 100644
--- a/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.Predicate;
  * </pre>
  *
  * @since 4.1
- * @version $Id$
  */
 public class PredicatedNavigableSet<E> extends PredicatedSortedSet<E> implements NavigableSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
index 709eed18b..333e205b7 100644
--- a/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.collection.PredicatedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSet<E> extends PredicatedCollection<E> implements Set<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
index d44c3f7e7..1f225c086 100644
--- a/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java
index 29c046f8f..eea49d75b 100644
--- a/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.Transformer;
  * use the Integer form to remove objects.
  *
  * @since 4.1
- * @version $Id$
  */
 public class TransformedNavigableSet<E> extends TransformedSortedSet<E> implements NavigableSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
index ad9c37587..8b3131ed8 100644
--- a/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.collection.TransformedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSet<E> extends TransformedCollection<E> implements Set<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
index aaa9a4a73..8d9a5992d 100644
--- a/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedSet<E> extends TransformedSet<E> implements SortedSet<E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
index 6135572f7..40b4dc46f 100644
--- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 4.1
- * @version $Id$
  */
 public final class UnmodifiableNavigableSet<E>
         extends AbstractNavigableSetDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
index 38378043a..159192a9f 100644
--- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableSet<E>
         extends AbstractSerializableSetDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
index 9163a8151..7131874d7 100644
--- a/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id$
  */
 public final class UnmodifiableSortedSet<E>
         extends AbstractSortedSetDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections4/set/package-info.java b/src/main/java/org/apache/commons/collections4/set/package-info.java
index 70877fbef..e78e238a0 100644
--- a/src/main/java/org/apache/commons/collections4/set/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/set/package-info.java
@@ -36,6 +36,5 @@
  *   <li>MapBackedSet - a set formed by decorating a Map
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.set;
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
index fed3e0976..6c788d969 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
  * {@link org.apache.commons.collections4.Get Get}&lt;K, V&gt; implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
index 4ace0bca7..cb0f4b842 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
@@ -53,7 +53,6 @@ import org.apache.commons.collections4.map.LinkedMap;
  * {@link org.apache.commons.collections4.Get Get} generalizations.
  *
  * @since 4.0
- * @version $Id$
  *
  * @see org.apache.commons.collections4.SplitMapUtils#readableMap(org.apache.commons.collections4.Get)
  * @see org.apache.commons.collections4.SplitMapUtils#writableMap(Put)
diff --git a/src/main/java/org/apache/commons/collections4/splitmap/package-info.java b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
index b4de18080..f407f6f08 100644
--- a/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
@@ -34,6 +34,5 @@
  *   <li>Transformed - transforms each element added
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.splitmap;
diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
index 722412069..04f53fa98 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Trie;
  * utility methods for actual bitwise {@link Trie} implementations.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractBitwiseTrie<K, V> extends AbstractMap<K, V>
         implements Trie<K, V>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
index 44259c817..e46cbfb7d 100644
--- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.OrderedMapIterator;
  * is related to the {@link Map} interface.
  *
  * @since 4.0
- * @version $Id$
  */
 abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
index 699eddfb3..a62d8f915 100644
--- a/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
@@ -30,7 +30,6 @@ import java.util.Comparator;
  * {@link #EQUAL_BIT_KEY}).
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class KeyAnalyzer<K> implements Comparator<K>, Serializable {
 
diff --git a/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
index ac3b76341..81ae5e981 100644
--- a/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
@@ -55,7 +55,6 @@ import org.apache.commons.collections4.trie.analyzer.StringKeyAnalyzer;
  * @see <a href="http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Tree/PATRICIA">PATRICIA</a>
  * @see <a href="http://www.imperialviolet.org/binary/critbit.pdf">Crit-Bit Tree</a>
  * @since 4.0
- * @version $Id$
  */
 public class PatriciaTrie<E> extends AbstractPatriciaTrie<String, E> {
 
diff --git a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
index e550e3b26..a18f7ef30 100644
--- a/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
+++ b/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
  * An unmodifiable {@link Trie}.
  *
  * @since 4.0
- * @version $Id$
  */
 public class UnmodifiableTrie<K, V> implements Trie<K, V>, Serializable, Unmodifiable {
 
diff --git a/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java b/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
index eba16a70a..9552e5a5c 100644
--- a/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
+++ b/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
@@ -22,7 +22,6 @@ import org.apache.commons.collections4.trie.KeyAnalyzer;
  * An {@link KeyAnalyzer} for {@link String}s.
  *
  * @since 4.0
- * @version $Id$
  */
 public class StringKeyAnalyzer extends KeyAnalyzer<String> {
 
diff --git a/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java b/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java
index 953edda21..f390ee8e4 100644
--- a/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java
@@ -17,6 +17,5 @@
 /**
  * This package contains various {@link org.apache.commons.collections4.trie.KeyAnalyzer} implementations.
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.trie.analyzer;
diff --git a/src/main/java/org/apache/commons/collections4/trie/package-info.java b/src/main/java/org/apache/commons/collections4/trie/package-info.java
index 4fafe50c6..adf4cbb50 100644
--- a/src/main/java/org/apache/commons/collections4/trie/package-info.java
+++ b/src/main/java/org/apache/commons/collections4/trie/package-info.java
@@ -32,6 +32,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id$
  */
 package org.apache.commons.collections4.trie;
diff --git a/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
index 933c7dbca..a067251b6 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.list.AbstractListTest;
 /**
  * Abstract test class for ArrayList.
  *
- * @version $Id$
  */
 public abstract class AbstractArrayListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
index a51536e8b..acaf9dc85 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.list.AbstractListTest;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link List} fails.
  *
- * @version $Id$
  */
 public abstract class AbstractLinkedListTest<T> extends AbstractListTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
index 7b6b6078a..c473a7369 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
@@ -38,7 +38,6 @@ import java.io.Serializable;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Object} fails.
  *
- * @version $Id$
  */
 public abstract class AbstractObjectTest extends BulkTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
index 8a9ec1606..b8f0a9699 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.map.AbstractMapTest;
 /**
  * Tests TreeMap.
  *
- * @version $Id$
  */
 public abstract class AbstractTreeMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/ArrayStackTest.java b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
index f5db98f98..845915bd4 100644
--- a/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
+++ b/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
@@ -23,7 +23,6 @@ import junit.framework.Test;
 /**
  * Tests ArrayStack.
  *
- * @version $Id$
  */
 @SuppressWarnings("deprecation") // we test a deprecated class
 public class ArrayStackTest<E> extends AbstractArrayListTest<E> {
diff --git a/src/test/java/org/apache/commons/collections4/BagUtilsTest.java b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
index 04187b493..6d0f856b0 100644
--- a/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
 /**
  * Tests for BagUtils factory methods.
  *
- * @version $Id$
  */
 public class BagUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java b/src/test/java/org/apache/commons/collections4/BulkTest.java
index 38c5fd49a..a613198e4 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -133,7 +133,6 @@ import junit.framework.TestSuite;
  *  The ordinary {@link TestSuite} constructor doesn't know how to
  *  interpret bulk test methods.
  *
- *  @version $Id$
  */
 public class BulkTest extends TestCase implements Cloneable {
 
diff --git a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
index 7f66bd2de..f4fa7bda5 100644
--- a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
@@ -35,7 +35,6 @@ import org.junit.Test;
  * Tests the ClosureUtils class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ClosureUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
index b6c0171f5..9553610b7 100644
--- a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
@@ -57,7 +57,6 @@ import org.junit.Test;
 /**
  * Tests for CollectionUtils.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class CollectionUtilsTest extends MockTestCase {
diff --git a/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java b/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
index 0dd72adf5..4c4b1a90f 100644
--- a/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 /**
  * Tests ComparatorUtils.
  *
- * @version $Id$
  */
 public class ComparatorUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
index bfb74e7c1..057f9f9d7 100644
--- a/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 /**
  * Tests EnumerationUtils.
  *
- * @version $Id$
  */
 public class EnumerationUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
index f1551c466..697caac18 100644
--- a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
@@ -36,7 +36,6 @@ import org.junit.Test;
  * Tests the org.apache.commons.collections.FactoryUtils class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FactoryUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
index 0c363f503..5b1851fc2 100644
--- a/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
+++ b/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
  * Tests for FluentIterable.
  *
  * @since 4.1
- * @version $Id$
  */
 public class FluentIterableTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
index c7245ada7..86db1b5ff 100644
--- a/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
@@ -42,7 +42,6 @@ import org.junit.Test;
  * Tests for IterableUtils.
  *
  * @since 4.1
- * @version $Id$
  */
 public class IterableUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
index a1c88b2d4..a27ad040d 100644
--- a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
@@ -50,7 +50,6 @@ import org.w3c.dom.NodeList;
 /**
  * Tests for IteratorUtils.
  *
- * @version $Id$
  */
 public class IteratorUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
index f8184ed64..fee64600e 100644
--- a/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
 /**
  * Tests for ListUtils.
  *
- * @version $Id$
  */
 public class ListUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/MapPerformance.java b/src/test/java/org/apache/commons/collections4/MapPerformance.java
index 7b955aa81..c0bffcfbe 100644
--- a/src/test/java/org/apache/commons/collections4/MapPerformance.java
+++ b/src/test/java/org/apache/commons/collections4/MapPerformance.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.map.Flat3Map;
 /**
  * <code>MapPerformanceTest</code> is designed to perform basic Map performance tests.
  *
- * @version $Id$
  */
 public class MapPerformance {
 
diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
index 5e84fa001..ebb879024 100644
--- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
@@ -48,7 +48,6 @@ import org.junit.Test;
 /**
  * Tests for MapUtils.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class MapUtilsTest {
diff --git a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
index 3765e2560..4e145592f 100644
--- a/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
@@ -33,7 +33,6 @@ import org.junit.Test;
  * Tests for MultiMapUtils
  *
  * @since 4.1
- * @version $Id$
  */
 public class MultiMapUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
index bff6f2329..a29048416 100644
--- a/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
@@ -41,7 +41,6 @@ import org.junit.Test;
  * Tests the PredicateUtils class.
  *
  * @since 3.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class PredicateUtilsTest extends AbstractPredicateTest {
diff --git a/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java b/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
index 882295fc8..e4a3fa030 100644
--- a/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Tests for QueueUtils factory methods.
  * 
- * @version $Id$
  */
 public class QueueUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/SetUtilsTest.java b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
index 11fa9fafc..bff420372 100644
--- a/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
@@ -35,7 +35,6 @@ import org.junit.Test;
 /**
  * Tests for SetUtils.
  *
- * @version $Id$
  */
 public class SetUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
index 01f580f1f..37b98664e 100644
--- a/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
@@ -35,7 +35,6 @@ import org.junit.Test;
  * Tests for {@link TransformedSplitMap}
  *
  * @since 4.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class SplitMapUtilsTest {
diff --git a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
index 9098ec6d2..2979d90b9 100644
--- a/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
@@ -42,7 +42,6 @@ import org.junit.Test;
  * Tests the TransformerUtils class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformerUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java b/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java
index 9a5b138b8..21dd3354e 100644
--- a/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Tests for TrieUtils factory methods.
  *
- * @version $Id$
  */
 public class TrieUtilsTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
index 2190827a2..87ec2c663 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
@@ -58,7 +58,6 @@ import org.apache.commons.collections4.set.AbstractSetTest;
  * {@link #makeFullCollection()} methods instead of {@link #resetEmpty()} and resetFull(),
  * otherwise the collection will be wrapped by a {@link CollectionBag} decorator.
  *
- * @version $Id$
  */
 public abstract class AbstractBagTest<T> extends AbstractCollectionTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
index 1c0ae5cbe..8be7b63cf 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.SortedBag;
  * methods and contracts.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
index dae6e2e0f..77d3477a5 100644
--- a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * Note: This test is mainly for serialization support, the CollectionBag decorator
  * is extensively used and tested in AbstractBagTest. 
  *
- * @version $Id$
  * @since 4.0
  */
 public class CollectionBagTest<T> extends AbstractCollectionTest<T> {
diff --git a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
index 1e60cf4ed..1922b386b 100644
--- a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * Note: This test is mainly for serialization support, the CollectionSortedBag decorator
  * is extensively used and tested in AbstractSortedBagTest. 
  *
- * @version $Id$
  * @since 4.0
  */
 public class CollectionSortedBagTest<T> extends AbstractCollectionTest<T> {
diff --git a/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
index 087819df1..b92c402ff 100644
--- a/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.BulkTest;
  * Extension of {@link AbstractBagTest} for exercising the {@link HashBag}
  * implementation.
  *
- * @version $Id$
  */
 public class HashBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
index 79adbee13..d99adfdfe 100644
--- a/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
index 71dc53f40..87312d3cb 100644
--- a/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
index b9a904873..0c1350a1b 100644
--- a/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.BulkTest;
  * implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class SynchronizedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
index 8b6f19358..adafe888c 100644
--- a/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedBagTest<T> extends AbstractBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
index 88040a7fe..7aa065dd4 100644
--- a/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
index 64fc40309..ad99c4453 100644
--- a/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.SortedBag;
  * Extension of {@link AbstractBagTest} for exercising the {@link TreeBag}
  * implementation.
  *
- * @version $Id$
  */
 public class TreeBagTest<T> extends AbstractSortedBagTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
index e5cb175c5..d9915c4c8 100644
--- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * {@link UnmodifiableBag} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class UnmodifiableBagTest<E> extends AbstractBagTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
index 4332ada39..93ffb8188 100644
--- a/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * {@link UnmodifiableSortedBag} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class UnmodifiableSortedBagTest<E> extends AbstractSortedBagTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
index e7d3a879d..cf5817717 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.map.AbstractIterableMapTest;
 /**
  * Abstract test class for {@link BidiMap} methods and contracts.
  *
- * @version $Id$
  */
 public abstract class AbstractBidiMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
index 3fd0d2f2a..9558a2c4a 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.OrderedBidiMap;
 /**
  * Test class for AbstractOrderedBidiMapDecorator.
  *
- * @version $Id$
  */
 public class AbstractOrderedBidiMapDecoratorTest<K, V>
         extends AbstractOrderedBidiMapTest<K, V> {
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
index 0bcb20913..b31f7b577 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
 /**
  * Abstract test class for {@link OrderedBidiMap} methods and contracts.
  *
- * @version $Id$
  */
 public abstract class AbstractOrderedBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
index a6d125c8e..3a9230c0b 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.map.AbstractSortedMapTest;
 /**
  * Abstract test class for {@link SortedBidiMap} methods and contracts.
  *
- * @version $Id$
  */
 public abstract class AbstractSortedBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
index a95097cfb..ed13fe91b 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class DualHashBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
index 564fc1de3..728eff80d 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class DualLinkedHashBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
index 014d3cbaf..cc4f7aaa3 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
@@ -37,7 +37,6 @@ import org.apache.commons.collections4.comparators.ReverseComparator;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class DualTreeBidiMap2Test<K extends Comparable<K>, V extends Comparable<V>> extends AbstractSortedBidiMapTest<K, V> {
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
index 4098db64a..51ddda868 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class DualTreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractSortedBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
index 55daf8474..a0bf32c0c 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class TreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
index c1f85e68a..7ea3483db 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Unmodifiable;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class UnmodifiableBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
index 501ed5aff..5966ffc07 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Unmodifiable;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class UnmodifiableOrderedBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
index 651e9d4b4..4ece7005e 100644
--- a/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Unmodifiable;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class UnmodifiableSortedBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractSortedBidiMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index e2dff1b19..6960043fd 100644
--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -117,7 +117,6 @@ import org.apache.commons.collections4.AbstractObjectTest;
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Collection} fails.
  *
- * @version $Id$
  */
 public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
index fc4f5d40b..855c60466 100644
--- a/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
@@ -28,7 +28,6 @@ import java.util.List;
  * {@link CompositeCollection} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CompositeCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
index 7015a3844..e78fff17b 100644
--- a/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.Transformer;
  * {@link IndexedCollection} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class IndexedCollectionTest extends AbstractCollectionTest<String> {
diff --git a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
index 9e65488f6..ab2f3385f 100644
--- a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
  * Tests the PredicatedCollection.Builder class.
  * 
  * @since 4.1
- * @version $Id$
  */
 public class PredicatedCollectionBuilderTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
index 3c0cd581e..ebd98d171 100644
--- a/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedCollection} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
index 583b98858..7b27ccf92 100644
--- a/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
@@ -25,7 +25,6 @@ import java.util.Collection;
  * {@link SynchronizedCollection} implementation.
  *
  * @since 3.1
- * @version $Id$
  */
 public class SynchronizedCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
index 8e6fecdac..399f0880c 100644
--- a/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.TransformerUtils;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedCollectionTest extends AbstractCollectionTest<Object> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
index d754d12a8..85cccb23b 100644
--- a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.list.FixedSizeList;
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableBoundedCollection} implementation.
  * 
- * @version $Id$
  */
 public class UnmodifiableBoundedCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
index 9afcc57a3..b41669480 100644
--- a/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * {@link UnmodifiableCollection} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableCollectionTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
index f3614403d..1b1478d71 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
@@ -26,7 +26,6 @@ import junit.framework.TestSuite;
 /**
  * Test the NullComparator.
  *
- * @version $Id$
  */
 public abstract class AbstractNullComparatorTest extends AbstractComparatorTest<Integer> {
 
diff --git a/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
index 4044e088a..c0d2a1531 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * Tests for {@link BooleanComparator}.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class BooleanComparatorTest extends AbstractComparatorTest<Boolean> {
diff --git a/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
index c0fed719b..3be50a45f 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
@@ -23,7 +23,6 @@ import java.util.List;
 /**
  * Tests for ComparableComparator.
  *
- * @version $Id$
  *
  */
 @SuppressWarnings("boxing")
diff --git a/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
index b135e55e8..d9edbae39 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
@@ -26,7 +26,6 @@ import org.junit.Test;
 /**
  * Tests for ComparatorChain.
  *
- * @version $Id$
  */
 public class ComparatorChainTest extends AbstractComparatorTest<ComparatorChainTest.PseudoRow> {
 
diff --git a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
index e8da9d95c..5d160e10a 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 /**
  * Test class for FixedOrderComparator.
  *
- * @version $Id$
  */
 public class FixedOrderComparatorTest extends AbstractComparatorTest<String> {
 
diff --git a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
index 601252b0f..3e5060ee6 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Tests for ReverseComparator.
  *
- * @version $Id$
  */
 public class ReverseComparatorTest extends AbstractComparatorTest<Integer> {
 
diff --git a/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
index 232d38d55..11cbd2780 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.TransformerUtils;
 /**
  * Test class for TransformingComparator.
  *
- * @version $Id$
  */
 public class TransformingComparatorTest extends AbstractComparatorTest<Integer> {
 
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
index ac9765bc5..fdec974b8 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
@@ -29,7 +29,6 @@ import java.util.Collections;
  * Base class for tests of AnyPredicate, AllPredicate, and OnePredicate.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractAnyAllOnePredicateTest<T> extends AbstractCompositePredicateTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
index 30bc0b630..978613bdc 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
  * Base class for tests of composite predicates.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractCompositePredicateTest<T> extends AbstractMockPredicateTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
index 832aa81dc..8fa58c306 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
@@ -31,7 +31,6 @@ import org.easymock.EasyMock;
  * provides methods to create and verify mock predicates to which to delegate.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMockPredicateTest<T> {
     /**
diff --git a/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
index cff1b4c80..17106456d 100644
--- a/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
+++ b/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
@@ -30,7 +30,6 @@ import java.util.Collections;
  * Tests the org.apache.commons.collections.functors.AllPredicate class.
  *
  * @since 3.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class AllPredicateTest extends AbstractAnyAllOnePredicateTest<Integer> {
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
index d46f99d1f..aa9e28284 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.AbstractObjectTest;
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractIteratorTest<E> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
index 7380f9d96..2183dd5d4 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
@@ -29,7 +29,6 @@ import java.util.NoSuchElementException;
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractListIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
index f095867a7..775801c28 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.MapIterator;
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapIteratorTest<K, V> extends AbstractIteratorTest<K> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
index 4d1e82812..b6c967737 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.OrderedMapIterator;
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractOrderedMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
index fe00aed3f..e7acf4947 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
@@ -22,7 +22,6 @@ import java.util.NoSuchElementException;
 /**
  * Tests the ArrayIterator with primitive type arrays.
  *
- * @version $Id$
  */
 public class ArrayIterator2Test<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
index 1314429b7..74d51f18d 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
@@ -24,7 +24,6 @@ import java.util.NoSuchElementException;
  * perform the iteration rather than the hasNext() method.
  * The code of this test was supplied by Mauricio S. Moura.
  *
- * @version $Id$
  */
 public class ArrayIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
index c385e79b3..068eaedf3 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
@@ -19,7 +19,6 @@ package org.apache.commons.collections4.iterators;
 /**
  * Test the ArrayListIterator class with primitives.
  *
- * @version $Id$
  */
 public class ArrayListIterator2Test<E> extends ArrayIterator2Test<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
index 95d84c7de..f738116c0 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
@@ -23,7 +23,6 @@ import java.util.NoSuchElementException;
 /**
  * Test the ArrayListIterator class.
  *
- * @version $Id$
  */
 public class ArrayListIteratorTest<E> extends ArrayIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
index 18abbd43c..0d868cb3c 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * A unit test to test the basic functions of {@link BoundedIterator}.
  *
- * @version $Id$
  */
 public class BoundedIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
index d46c35b70..6d52de1b6 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.comparators.ComparableComparator;
 /**
  * Unit test suite for {@link CollatingIterator}.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class CollatingIteratorTest extends AbstractIteratorTest<Integer> {
diff --git a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
index a5adf2a0a..e67ccd183 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.functors.NotNullPredicate;
 /**
  * Test the filter iterator.
  *
- * @version $Id$
  */
 public class FilterIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
index ff2454f66..32735f310 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
@@ -31,7 +31,6 @@ import org.junit.Assert;
 /**
  * Tests the FilterListIterator class.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class FilterListIteratorTest extends TestCase {
diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
index 727c1613e..1fd563933 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Predicate;
 /**
  * Tests the IteratorChain class.
  *
- * @version $Id$
  */
 public class IteratorChainTest extends AbstractIteratorTest<String> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java
index ca276352e..1f6005256 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java
@@ -26,7 +26,6 @@ import junit.framework.TestCase;
 /**
  * Tests the IteratorEnumeration.
  * 
- * @version $Id$
  */
 public class IteratorEnumerationTest extends TestCase {
     
diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
index dcdc3ba74..d88e7ac37 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * Tests for IteratorIterable.
  *
- * @version $Id$
  */
 public class IteratorIterableTest extends BulkTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
index 5ec819a42..a8e4c066e 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Predicate;
 /**
  * Tests the LazyIteratorChain class.
  *
- * @version $Id$
  */
 public class LazyIteratorChainTest extends AbstractIteratorTest<String> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
index 2d83fbc0b..4c1e6ab6b 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.ResettableListIterator;
 /**
  * Tests the ListIteratorWrapper to insure that it behaves as expected when wrapping a ListIterator.
  *
- * @version $Id$
  */
 public class ListIteratorWrapper2Test<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
index 960fc25df..af38e381c 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.ResettableListIterator;
  * Tests the ListIteratorWrapper to insure that it simulates
  * a ListIterator correctly.
  *
- * @version $Id$
  */
 public class ListIteratorWrapperTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
index 80e10709e..4ed848077 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
@@ -26,7 +26,6 @@ import junit.framework.TestCase;
 /**
  * Tests the LoopingIterator class.
  *
- * @version $Id$
  */
 public class LoopingIteratorTest extends TestCase {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
index 928a765ad..5c5f8cbaa 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
@@ -26,7 +26,6 @@ import junit.framework.TestCase;
 /**
  * Tests the LoopingListIterator class.
  *
- * @version $Id$
  */
 public class LoopingListIteratorTest extends TestCase {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
index c3e415e80..f17d3d1ca 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
@@ -22,7 +22,6 @@ import java.util.NoSuchElementException;
 /**
  * Tests the ObjectArrayIterator.
  *
- * @version $Id$
  */
 public class ObjectArrayIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
index d8653d148..54d8f54e5 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
@@ -19,7 +19,6 @@ package org.apache.commons.collections4.iterators;
 /**
  * Tests the ObjectArrayListIterator class.
  *
- * @version $Id$
  */
 public class ObjectArrayListIterator2Test<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
index 719fb0ba3..e2d000322 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
@@ -23,7 +23,6 @@ import java.util.NoSuchElementException;
 /**
  * Tests the ObjectArrayListIterator class.
  *
- * @version $Id$
  */
 public class ObjectArrayListIteratorTest<E> extends ObjectArrayIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
index fdbc03e6b..78024eb4d 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Transformer;
 /**
  * Testcase.
  *
- * @version $Id$
  */
 public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
index c036b4bb3..c3191b31a 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 /**
  * Tests the PeekingIterator.
  *
- * @version $Id$
  */
 public class PeekingIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
index ef0ab44bd..e8119f3f0 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
@@ -27,7 +27,6 @@ import java.util.Set;
 /**
  * Test class for PermutationIterator.
  *
- * @version $Id$
  * @since 4.0
  */
 public class PermutationIteratorTest extends AbstractIteratorTest<List<Character>> {
diff --git a/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
index 8cde44638..6561704c8 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 /**
  * Tests the PushbackIterator.
  * 
- * @version $Id$
  */
 public class PushbackIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
index 9bf04b952..ba6516f2e 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.ResettableListIterator;
 /**
  * Tests the ReverseListIterator.
  *
- * @version $Id$
  */
 public class ReverseListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
index 2e00ee1df..c5126db00 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  *
- * @version $Id$
  */
 public class SingletonIterator2Test<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
index 628ac839c..0422bd53f 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.ResettableIterator;
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  *
- * @version $Id$
  */
 public class SingletonIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
index 9d9ff407c..3daddde76 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.ResettableListIterator;
 /**
  * Tests the SingletonListIterator.
  *
- * @version $Id$
  */
 public class SingletonListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
index f4bf3bd7e..052201ad6 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 /**
  * A unit test to test the basic functions of {@link SkippingIterator}.
  *
- * @version $Id$
  */
 public class SkippingIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
index a22fa2c55..427a5f89c 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
@@ -24,7 +24,6 @@ import java.util.NoSuchElementException;
 /**
  * Tests the UniqueFilterIterator class.
  *
- * @version $Id$
  */
 public class UniqueFilterIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
index d86e80cfb..6ba8fd9f5 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Unmodifiable;
 /**
  * Tests the UnmodifiableIterator.
  *
- * @version $Id$
  */
 public class UnmodifiableIteratorTest<E> extends AbstractIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
index 40a89ba59..7f6ca2615 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Unmodifiable;
 /**
  * Tests the UnmodifiableListIterator.
  *
- * @version $Id$
  */
 public class UnmodifiableListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
index 406bff7da..5b73092d5 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.bidimap.DualHashBidiMap;
 /**
  * Tests the UnmodifiableMapIterator.
  *
- * @version $Id$
  */
 public class UnmodifiableMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
index ac17c6789..511e4a8fc 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.map.ListOrderedMap;
 /**
  * Tests the UnmodifiableOrderedMapIterator.
  *
- * @version $Id$
  */
 public class UnmodifiableOrderedMapIteratorTest<K, V> extends AbstractOrderedMapIteratorTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
index 47c45889f..104acf28e 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.IteratorUtils;
 /**
  * Unit test suite for {@link ZippingIterator}.
  *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class ZippingIteratorTest extends AbstractIteratorTest<Integer> {
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
index f8b44cc1d..0f233ac47 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
@@ -29,7 +29,6 @@ import junit.framework.TestCase;
  * type being tested.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractMapEntryTest<K, V> extends TestCase {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
index f3587d2f6..6601d77b7 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
  * Test the DefaultKeyValue class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class DefaultKeyValueTest<K, V> extends TestCase {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
index 339e0242f..5c8c4b273 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.KeyValue;
  * Test the DefaultMapEntry class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class DefaultMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
index 0bbfa43d5..500b837c9 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
@@ -31,7 +31,6 @@ import junit.framework.TestCase;
 /**
  * Unit tests for {@link org.apache.commons.collections4.keyvalue.MultiKey}.
  *
- * @version $Id$
  */
 public class MultiKeyTest extends TestCase {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
index 917b040a4..706e886d4 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
@@ -23,7 +23,6 @@ import java.util.Map;
  * Test the TiedMapEntry class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TiedMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
index 08db57488..70e37931e 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Test the UnmodifiableMapEntry class.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
index dd421e43e..9037b1bd0 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
 /**
  * Test case for {@link AbstractLinkedList}.
  *
- * @version $Id$
  */
 public abstract class AbstractLinkedListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index bc4ce7cbb..bb6741faa 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -46,7 +46,6 @@ import org.apache.commons.collections4.iterators.AbstractListIteratorTest;
  * test case (method) your {@link List} fails or override one of the
  * protected methods from AbstractCollectionTest.
  *
- * @version $Id$
  */
 public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
index 9a2b316ee..b7316bbcf 100644
--- a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * Test class.
  *
- * @version $Id$
  */
 public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
     public CursorableLinkedListTest(final String testName) {
diff --git a/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
index a93b80664..bb99abbf6 100644
--- a/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
@@ -25,7 +25,6 @@ import java.util.List;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
index da3fedd0c..893597b33 100644
--- a/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
@@ -25,7 +25,6 @@ import java.util.List;
  * Extension of {@link AbstractListTest} for exercising the {@link GrowthList}.
  *
  * @since 3.2
- * @version $Id$
  */
 public class GrowthListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
index 00c57d46b..428d0a72f 100644
--- a/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * Test class for NodeCachingLinkedList, a performance optimised LinkedList.
  *
- * @version $Id$
  */
 public class NodeCachingLinkedListTest<E> extends AbstractLinkedListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
index 0ecaf0db1..4cfc3bdf7 100644
--- a/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedList} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
index 4b5edb268..01b5e2fc7 100644
--- a/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
@@ -29,7 +29,6 @@ import java.util.Set;
  * JUnit tests.
  *
  * @since 3.0
- * @version $Id$
  */
 public class SetUniqueListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
index 97fb889da..10d28ebd4 100644
--- a/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
index 98bd96fcd..b077b7a2a 100644
--- a/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.BulkTest;
  * JUnit tests
  *
  * @since 3.1
- * @version $Id$
  */
 public class TreeListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
index 8265d23cb..d5a50cd51 100644
--- a/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
@@ -26,7 +26,6 @@ import java.util.List;
  * {@link UnmodifiableList} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableListTest<E> extends AbstractListTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
index cfed604e2..98679bcde 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
 /**
  * Abstract test class for {@link IterableMap} methods and contracts.
  *
- * @version $Id$
  */
 public abstract class AbstractIterableMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index 1739a5f55..b6f719f96 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -119,7 +119,6 @@ import org.apache.commons.collections4.set.AbstractSetTest;
  * cases.  For example, if your map does not allow duplicate values, override
  * {@link #isAllowDuplicateValues()} and have it return <code>false</code>
  *
- * @version $Id$
  */
 public abstract class AbstractMapTest<K, V> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
index 037738380..c46bceae8 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
@@ -34,7 +34,6 @@ import org.apache.commons.collections4.iterators.AbstractOrderedMapIteratorTest;
 /**
  * Abstract test class for {@link OrderedMap} methods and contracts.
  *
- * @version $Id$
  */
 public abstract class AbstractOrderedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
index 8991a5f87..7a33ae409 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * Abstract test class for {@link java.util.SortedMap} methods and contracts.
  *
- * @version $Id$
  */
 public abstract class AbstractSortedMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java b/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
index 2d06e61b6..a43f107d1 100644
--- a/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * Tests for the {@link CaseInsensitiveMap} implementation.
  *
- * @version $Id$
  */
 public class CaseInsensitiveMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
index f89416968..8841ab469 100644
--- a/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
@@ -25,7 +25,6 @@ import java.util.Collection;
  * {@link CompositeMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CompositeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
     /** used as a flag in MapMutator tests */
diff --git a/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
index 44806d74b..0c9210903 100644
--- a/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.functors.ConstantFactory;
  * {@link DefaultedMap} implementation.
  *
  * @since 3.2
- * @version $Id$
  */
 public class DefaultedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
index 937d36be8..349bdbd99 100644
--- a/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.IterableMap;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
index 0efa502da..b949993c0 100644
--- a/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.BulkTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class FixedSizeSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
index a195994ac..a619d9448 100644
--- a/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java b/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
index 6dddcdd62..08852bc8c 100644
--- a/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.collections4.BulkTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class HashedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/IdentityMap.java b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
index 54050e5dd..c3ecb5b05 100644
--- a/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
+++ b/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
@@ -41,7 +41,6 @@ import java.util.Map;
  * test-class because it is still used by the ReferenceIdentityMapTest.
  *
  * @since 3.0
- * @version $Id$
  */
 public class IdentityMap<K, V>
         extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
diff --git a/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java b/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
index 69efa932b..fb6ee9939 100644
--- a/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.ResettableIterator;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class LRUMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
index 756ae9565..caa7f9a20 100644
--- a/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
  * {@link LazyMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class LazyMapTest<K, V> extends AbstractIterableMapTest<K, V> {
diff --git a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
index e42c32124..f031591eb 100644
--- a/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
@@ -34,7 +34,6 @@ import org.junit.Test;
  * {@link LazySortedMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
diff --git a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
index 34879d485..bb9bef93a 100644
--- a/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.list.AbstractListTest;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
index 26c191899..216fc59a9 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.list.AbstractListTest;
  * implementation.
  *
  * @since 3.1
- * @version $Id$
  */
 public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
index e24ff542a..a79227b40 100644
--- a/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.list.AbstractListTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
index ba16eb7ec..527c11a05 100644
--- a/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.keyvalue.MultiKey;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class MultiKeyMapTest<K, V> extends AbstractIterableMapTest<MultiKey<? extends K>, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
index 2fb3a3d7e..097ec2a1e 100644
--- a/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.MultiMap;
  * TestMultiValueMap.
  *
  * @since 3.2
- * @version $Id$
  */
 @Deprecated
 public class MultiValueMapTest<K, V> extends AbstractObjectTest {
diff --git a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
index a96c5679e..c633cecc0 100644
--- a/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.map.PassiveExpiringMap.ExpirationPolicy;
  * JUnit tests.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PassiveExpiringMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
index d5e3ba4e1..b928bdbe1 100644
--- a/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
index 307b318ac..b2f6ef2ba 100644
--- a/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedSortedMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
index c56dbff1b..04210b7a5 100644
--- a/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrengt
 /**
  * Tests for ReferenceIdentityMap.
  *
- * @version $Id$
  */
 public class ReferenceIdentityMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
index dec541854..901cb0ffb 100644
--- a/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrengt
 /**
  * Tests for ReferenceMap.
  *
- * @version $Id$
  */
 public class ReferenceMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
index e28d89b01..a154ebeeb 100644
--- a/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.OrderedMap;
 /**
  * JUnit tests.
  *
- * @version $Id$
  */
 public class SingletonMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
index 47bfef811..26d9208eb 100644
--- a/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.BulkTest;
  * Unit tests.
  * {@link StaticBucketMap}.
  *
- * @version $Id$
  */
 public class StaticBucketMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
index 7837a77dc..c2eaff76e 100644
--- a/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
index cfafb2572..202dc0a7b 100644
--- a/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
index d23ae1e7d..73a64e3ba 100644
--- a/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * {@link UnmodifiableMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
index 0c98a352e..f186359d3 100644
--- a/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * {@link UnmodifiableOrderedMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java b/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
index b3ce216d3..fd6c5fa93 100644
--- a/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * {@link UnmodifiableSortedMap} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
index 9e350d028..1faaaa794 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
@@ -48,7 +48,6 @@ import org.apache.commons.collections4.set.AbstractSetTest;
  * necessary override the {@link #makeFullMap()} method.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiValuedMapTest<K, V> extends AbstractObjectTest {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
index 883b87ae1..286c0b351 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.MultiValuedMap;
  * Test ArrayListValuedHashMap
  *
  * @since 4.1
- * @version $Id$
  */
 public class ArrayListValuedHashMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
index fc31bad6c..61d553861 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.SetValuedMap;
  * Test HashSetValuedHashMap
  *
  * @since 4.1
- * @version $Id$
  */
 public class HashSetValuedHashMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
index 70e068f54..5f160871d 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * Tests for TransformedMultiValuedMap
  * 
  * @since 4.1
- * @version $Id$
  */
 public class TransformedMultiValuedMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
index 1379d5a61..5851ce04f 100644
--- a/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * Tests for UnmodifiableMultiValuedMap
  * 
  * @since 4.1
- * @version $Id$
  */
 public class UnmodifiableMultiValuedMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index dde3c40bf..5775634f7 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -54,7 +54,6 @@ import org.apache.commons.collections4.set.AbstractSetTest;
  * {@link #makeFullCollection()} methods instead of {@link #resetEmpty()} and resetFull().
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractMultiSetTest<T> extends AbstractCollectionTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
index bee9c4c97..daea1d0eb 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.MultiSet;
  * {@link HashMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class HashMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
index 75bff5345..fa36ad5c8 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class PredicatedMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
index 7133fa6dd..76a77bf21 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.MultiSet;
  * {@link SynchronizedMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class SynchronizedMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff --git a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
index 5ef4fcf6f..1b221f9ef 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * {@link UnmodifiableMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class UnmodifiableMultiSetTest<E> extends AbstractMultiSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
index 5cf402917..3d49d612e 100644
--- a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
@@ -39,7 +39,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * protected methods from AbstractCollectionTest.
  *
  * @since 4.0
- * @version $Id$
  */
 public abstract class AbstractQueueTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
index f2b0edc77..ac5187435 100644
--- a/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
@@ -31,7 +31,6 @@ import java.util.Queue;
  * Test cases for CircularFifoQueue.
  *
  * @since 4.0
- * @version $Id$
  */
 public class CircularFifoQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
index 3f027963c..4e90b7600 100644
--- a/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedQueue} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PredicatedQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
index 5b01462b1..5c6ba658c 100644
--- a/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * {@link TransformedQueue} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class TransformedQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
index 1f1d96a5e..bdd4e1001 100644
--- a/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * {@link UnmodifiableQueue} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class UnmodifiableQueueTest<E> extends AbstractQueueTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
index 927719fe9..6e4615020 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.BulkTest;
  * elements may be added; see {@link AbstractSetTest} for more details.
  *
  * @since 4.1
- * @version $Id$
  */
 public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
index da1f7501a..cea912a38 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
@@ -38,7 +38,6 @@ import org.apache.commons.collections4.collection.AbstractCollectionTest;
  * elements may be added; see {@link AbstractCollectionTest} for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSetTest<E> extends AbstractCollectionTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
index e0bc53cf4..602f9fbad 100644
--- a/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.BulkTest;
  * elements may be added; see {@link AbstractSetTest} for more details.
  *
  * @since 3.0
- * @version $Id$
  */
 public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
index 3420eafdf..83618c393 100644
--- a/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.set.CompositeSet.SetMutator;
  * {@link CompositeSet} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class CompositeSetTest<E> extends AbstractSetTest<E> {
     public CompositeSetTest(final String name) {
diff --git a/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
index 532127804..71b814899 100644
--- a/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
+++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
@@ -25,7 +25,6 @@ import java.util.List;
  * implementation.
  *
  * @since 3.1
- * @version $Id$
  */
 public class ListOrderedSet2Test<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
index 4ed0f3baa..6ad312611 100644
--- a/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.IteratorUtils;
  * {@link ListOrderedSet} implementation.
  * 
  * @since 3.0
- * @version $Id$
  */
 public class ListOrderedSetTest<E>
     extends AbstractSetTest<E> {
diff --git a/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
index b280d1d7a..d5322a573 100644
--- a/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
+++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.map.LinkedMap;
  * JUnit test.
  *
  * @since 3.1
- * @version $Id$
  */
 public class MapBackedSet2Test<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
index 1273d4655..e3ac080e5 100644
--- a/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
@@ -24,7 +24,6 @@ import org.apache.commons.collections4.map.HashedMap;
  * JUnit test.
  *
  * @since 3.1
- * @version $Id$
  */
 public class MapBackedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
index 6b9aae9cb..57333f483 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedNavigableSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class PredicatedNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
index c107f9b86..5bc7d42d2 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedSet} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
index 27a8b49d6..7d3022e36 100644
--- a/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.functors.TruePredicate;
  * {@link PredicatedSortedSet} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class PredicatedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
index 7b77c3092..dd5d2b422 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * {@link TransformedNavigableSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class TransformedNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
index 2f8e11621..fcd98511a 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
index 594cfbed1..bb31aa2b7 100644
--- a/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
@@ -33,7 +33,6 @@ import org.apache.commons.collections4.collection.TransformedCollectionTest;
  * implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class TransformedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
index e4afcd82e..4d0d7c63a 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.BulkTest;
  * {@link UnmodifiableNavigableSet} implementation.
  *
  * @since 4.1
- * @version $Id$
  */
 public class UnmodifiableNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
     protected UnmodifiableNavigableSet<E> set = null;
diff --git a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
index 55146edf5..536968db7 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
@@ -30,7 +30,6 @@ import org.apache.commons.collections4.Unmodifiable;
  * {@link UnmodifiableSet} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableSetTest<E> extends AbstractSetTest<E> {
 
diff --git a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
index 037d91783..ebdfbc726 100644
--- a/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.collections4.BulkTest;
  * {@link UnmodifiableSortedSet} implementation.
  *
  * @since 3.0
- * @version $Id$
  */
 public class UnmodifiableSortedSetTest<E> extends AbstractSortedSetTest<E> {
     protected UnmodifiableSortedSet<E> set = null;
diff --git a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
index 98b5ecb4b..22504cd8c 100644
--- a/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
@@ -31,7 +31,6 @@ import org.apache.commons.collections4.functors.NOPTransformer;
  * Tests for {@link TransformedSplitMap}
  *
  * @since 4.0
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class TransformedSplitMapTest extends BulkTest {
diff --git a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
index 04e773e5e..6266f0a2a 100644
--- a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
+++ b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
@@ -26,7 +26,6 @@ import org.apache.commons.collections4.map.AbstractOrderedMapTest;
  * JUnit test of the OrderedMap interface of a PatriciaTrie.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PatriciaTrie2Test<V> extends AbstractOrderedMapTest<String, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
index c143f0018..88919a372 100755
--- a/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
+++ b/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
@@ -37,7 +37,6 @@ import org.junit.Assert;
  * JUnit tests for the PatriciaTrie.
  *
  * @since 4.0
- * @version $Id$
  */
 public class PatriciaTrieTest<V> extends AbstractSortedMapTest<String, V> {
 
diff --git a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
index df30a6b44..a8de8a5fb 100644
--- a/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
+++ b/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
@@ -28,7 +28,6 @@ import org.apache.commons.collections4.map.AbstractSortedMapTest;
  * {@link UnmodifiableTrie} implementation.
  *
  * @since 4.0
- * @version $Id$
  */
 public class UnmodifiableTrieTest<V> extends AbstractSortedMapTest<String, V> {