diff --git a/src/main/java/org/apache/commons/csv/Assertions.java b/src/main/java/org/apache/commons/csv/Assertions.java
index 65c2214e..f22002d8 100644
--- a/src/main/java/org/apache/commons/csv/Assertions.java
+++ b/src/main/java/org/apache/commons/csv/Assertions.java
@@ -23,8 +23,6 @@ import java.util.Objects;
  * Utility class for input parameter validation.
  *
  * TODO Replace usage with {@link Objects} when we switch to Java 7.
- *
- * @version $Id$
  */
 final class Assertions {
 
diff --git a/src/main/java/org/apache/commons/csv/CSVFormat.java b/src/main/java/org/apache/commons/csv/CSVFormat.java
index b2305888..bae5a970 100644
--- a/src/main/java/org/apache/commons/csv/CSVFormat.java
+++ b/src/main/java/org/apache/commons/csv/CSVFormat.java
@@ -152,8 +152,6 @@ import java.util.Set;
  * <p>
  * This class is immutable.
  * </p>
- *
- * @version $Id$
  */
 public final class CSVFormat implements Serializable {
 
diff --git a/src/main/java/org/apache/commons/csv/CSVParser.java b/src/main/java/org/apache/commons/csv/CSVParser.java
index 4580f41b..17d1c204 100644
--- a/src/main/java/org/apache/commons/csv/CSVParser.java
+++ b/src/main/java/org/apache/commons/csv/CSVParser.java
@@ -129,8 +129,6 @@ import java.util.TreeMap;
  * Internal parser state is completely covered by the format and the reader-state.
  * </p>
  *
- * @version $Id$
- *
  * @see <a href="package-summary.html">package documentation for more details</a>
  */
 public final class CSVParser implements Iterable<CSVRecord>, Closeable {
diff --git a/src/main/java/org/apache/commons/csv/CSVPrinter.java b/src/main/java/org/apache/commons/csv/CSVPrinter.java
index 265d11d0..96b24a41 100644
--- a/src/main/java/org/apache/commons/csv/CSVPrinter.java
+++ b/src/main/java/org/apache/commons/csv/CSVPrinter.java
@@ -29,8 +29,6 @@ import java.sql.SQLException;
 
 /**
  * Prints values in a CSV format.
- *
- * @version $Id$
  */
 public final class CSVPrinter implements Flushable, Closeable {
 
diff --git a/src/main/java/org/apache/commons/csv/CSVRecord.java b/src/main/java/org/apache/commons/csv/CSVRecord.java
index d2cbe6ac..34a3ba21 100644
--- a/src/main/java/org/apache/commons/csv/CSVRecord.java
+++ b/src/main/java/org/apache/commons/csv/CSVRecord.java
@@ -27,8 +27,6 @@ import java.util.Map.Entry;
 
 /**
  * A CSV record parsed from a CSV file.
- *
- * @version $Id$
  */
 public final class CSVRecord implements Serializable, Iterable<String> {
 
diff --git a/src/main/java/org/apache/commons/csv/Constants.java b/src/main/java/org/apache/commons/csv/Constants.java
index a8da45b1..b7dc770a 100644
--- a/src/main/java/org/apache/commons/csv/Constants.java
+++ b/src/main/java/org/apache/commons/csv/Constants.java
@@ -19,8 +19,6 @@ package org.apache.commons.csv;
 
 /**
  * Constants for this package.
- *
- * @version $Id$
  */
 final class Constants {
 
diff --git a/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java b/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
index 603f5207..23a40427 100644
--- a/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
+++ b/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
@@ -32,8 +32,6 @@ import java.io.Reader;
  * In particular the reader supports a look-ahead option, which allows you to see the next char returned by
  * {@link #read()}. This reader also tracks how many characters have been read with {@link #getPosition()}.
  * </p>
- *
- * @version $Id$
  */
 final class ExtendedBufferedReader extends BufferedReader {
 
diff --git a/src/main/java/org/apache/commons/csv/Lexer.java b/src/main/java/org/apache/commons/csv/Lexer.java
index d8cdbf78..8106532a 100644
--- a/src/main/java/org/apache/commons/csv/Lexer.java
+++ b/src/main/java/org/apache/commons/csv/Lexer.java
@@ -35,8 +35,6 @@ import java.io.IOException;
 
 /**
  * Lexical analyzer.
- *
- * @version $Id$
  */
 final class Lexer implements Closeable {
 
diff --git a/src/main/java/org/apache/commons/csv/QuoteMode.java b/src/main/java/org/apache/commons/csv/QuoteMode.java
index 08a9b725..216f775d 100644
--- a/src/main/java/org/apache/commons/csv/QuoteMode.java
+++ b/src/main/java/org/apache/commons/csv/QuoteMode.java
@@ -19,7 +19,6 @@ package org.apache.commons.csv;
 /**
  * Defines quote behavior when printing.
  *
- * @version $Id$
  */
 public enum QuoteMode {
 
diff --git a/src/main/java/org/apache/commons/csv/Token.java b/src/main/java/org/apache/commons/csv/Token.java
index 26f3508d..861e097d 100644
--- a/src/main/java/org/apache/commons/csv/Token.java
+++ b/src/main/java/org/apache/commons/csv/Token.java
@@ -23,8 +23,6 @@ import static org.apache.commons.csv.Token.Type.INVALID;
  * Internal token representation.
  * <p/>
  * It is used as contract between the lexer and the parser.
- *
- * @version $Id$
  */
 final class Token {
 
diff --git a/src/test/java/org/apache/commons/csv/AssertionsTest.java b/src/test/java/org/apache/commons/csv/AssertionsTest.java
index ca2c8d08..af41275d 100644
--- a/src/test/java/org/apache/commons/csv/AssertionsTest.java
+++ b/src/test/java/org/apache/commons/csv/AssertionsTest.java
@@ -20,7 +20,6 @@ package org.apache.commons.csv;
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class AssertionsTest {
 
diff --git a/src/test/java/org/apache/commons/csv/CSVFileParserTest.java b/src/test/java/org/apache/commons/csv/CSVFileParserTest.java
index 50b78437..2907de03 100644
--- a/src/test/java/org/apache/commons/csv/CSVFileParserTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVFileParserTest.java
@@ -42,8 +42,6 @@ import org.junit.runners.Parameterized.Parameters;
 
 /**
  * Parse tests using test files
- *
- * @version $Id$
  */
 @RunWith(Parameterized.class)
 public class CSVFileParserTest {
diff --git a/src/test/java/org/apache/commons/csv/CSVFormatTest.java b/src/test/java/org/apache/commons/csv/CSVFormatTest.java
index 4491b53c..d458555c 100644
--- a/src/test/java/org/apache/commons/csv/CSVFormatTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVFormatTest.java
@@ -41,8 +41,6 @@ import org.junit.Test;
 
 /**
  *
- *
- * @version $Id$
  */
 public class CSVFormatTest {
 
diff --git a/src/test/java/org/apache/commons/csv/CSVParserTest.java b/src/test/java/org/apache/commons/csv/CSVParserTest.java
index 8a1b5679..462e32cb 100644
--- a/src/test/java/org/apache/commons/csv/CSVParserTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVParserTest.java
@@ -56,8 +56,6 @@ import org.junit.Test;
  * The test are organized in three different sections: The 'setter/getter' section, the lexer section and finally the
  * parser section. In case a test fails, you should follow a top-down approach for fixing a potential bug (its likely
  * that the parser itself fails if the lexer has problems...).
- *
- * @version $Id$
  */
 public class CSVParserTest {
 
diff --git a/src/test/java/org/apache/commons/csv/CSVPrinterTest.java b/src/test/java/org/apache/commons/csv/CSVPrinterTest.java
index 0c831eed..4a0ffbff 100644
--- a/src/test/java/org/apache/commons/csv/CSVPrinterTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVPrinterTest.java
@@ -54,8 +54,6 @@ import org.junit.Test;
 
 /**
  *
- *
- * @version $Id$
  */
 public class CSVPrinterTest {
 
diff --git a/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java b/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java
index 86f33353..d17b483c 100644
--- a/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java
+++ b/src/test/java/org/apache/commons/csv/ExtendedBufferedReaderTest.java
@@ -29,8 +29,6 @@ import org.junit.Test;
 
 /**
  *
- *
- * @version $Id$
  */
 public class ExtendedBufferedReaderTest {
 
diff --git a/src/test/java/org/apache/commons/csv/LexerTest.java b/src/test/java/org/apache/commons/csv/LexerTest.java
index 26fa843a..6e05fb90 100644
--- a/src/test/java/org/apache/commons/csv/LexerTest.java
+++ b/src/test/java/org/apache/commons/csv/LexerTest.java
@@ -40,8 +40,6 @@ import org.junit.Test;
 
 /**
  *
- *
- * @version $Id$
  */
 public class LexerTest {
 
diff --git a/src/test/java/org/apache/commons/csv/PerformanceTest.java b/src/test/java/org/apache/commons/csv/PerformanceTest.java
index 226ed962..65d8de9b 100644
--- a/src/test/java/org/apache/commons/csv/PerformanceTest.java
+++ b/src/test/java/org/apache/commons/csv/PerformanceTest.java
@@ -35,8 +35,6 @@ import org.apache.commons.io.IOUtils;
  * Basic test harness.
  *
  * Requires test file to be downloaded separately.
- *
- * @version $Id$
  */
 @SuppressWarnings("boxing")
 public class PerformanceTest {
diff --git a/src/test/java/org/apache/commons/csv/Utils.java b/src/test/java/org/apache/commons/csv/Utils.java
index 164a9190..dcf2cc18 100644
--- a/src/test/java/org/apache/commons/csv/Utils.java
+++ b/src/test/java/org/apache/commons/csv/Utils.java
@@ -24,8 +24,6 @@ import org.junit.Assert;
 
 /**
  * Utility methods for test cases
- *
- * @version $Id$
  */
 final class Utils {
 
diff --git a/src/test/java/org/apache/commons/csv/perf/PerformanceTest.java b/src/test/java/org/apache/commons/csv/perf/PerformanceTest.java
index 41b4d235..887cc8ea 100644
--- a/src/test/java/org/apache/commons/csv/perf/PerformanceTest.java
+++ b/src/test/java/org/apache/commons/csv/perf/PerformanceTest.java
@@ -39,8 +39,6 @@ import org.junit.Test;
  * Tests performance.
  *
  * To run this test, use: mvn test -Dtest=PeformanceTest
- *
- * @version $Id$
  */
 @SuppressWarnings("boxing") // test code
 public class PerformanceTest {