diff --git a/lib/SOURCE_HEADER b/lib/SOURCE_HEADER
index 795b8c99..b8064d6e 100644
--- a/lib/SOURCE_HEADER
+++ b/lib/SOURCE_HEADER
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/Log.java b/src/main/java/com/samskivert/Log.java
index eef5db89..78f88048 100644
--- a/src/main/java/com/samskivert/Log.java
+++ b/src/main/java/com/samskivert/Log.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/annotation/ReplacedBy.java b/src/main/java/com/samskivert/annotation/ReplacedBy.java
index 2a823037..c47bc1ee 100644
--- a/src/main/java/com/samskivert/annotation/ReplacedBy.java
+++ b/src/main/java/com/samskivert/annotation/ReplacedBy.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java b/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java
index f2ae5ef7..4d921fc8 100644
--- a/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java
+++ b/src/main/java/com/samskivert/io/ByteArrayOutInputStream.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/io/ExtensiblePrintStream.java b/src/main/java/com/samskivert/io/ExtensiblePrintStream.java
index 7fb96c66..23188dda 100644
--- a/src/main/java/com/samskivert/io/ExtensiblePrintStream.java
+++ b/src/main/java/com/samskivert/io/ExtensiblePrintStream.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/io/PersistenceException.java b/src/main/java/com/samskivert/io/PersistenceException.java
index 006523c2..97f5ed74 100644
--- a/src/main/java/com/samskivert/io/PersistenceException.java
+++ b/src/main/java/com/samskivert/io/PersistenceException.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/io/StreamUtil.java b/src/main/java/com/samskivert/io/StreamUtil.java
index 632b8aab..fbe992d5 100644
--- a/src/main/java/com/samskivert/io/StreamUtil.java
+++ b/src/main/java/com/samskivert/io/StreamUtil.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/main/java/com/samskivert/io/package.html b/src/main/java/com/samskivert/io/package.html
index e4a98cb1..e39c5078 100644
--- a/src/main/java/com/samskivert/io/package.html
+++ b/src/main/java/com/samskivert/io/package.html
@@ -3,10 +3,8 @@
diff --git a/src/main/sql/create_site_tables.mysql b/src/main/sql/create_site_tables.mysql
index 782e7867..406a860a 100644
--- a/src/main/sql/create_site_tables.mysql
+++ b/src/main/sql/create_site_tables.mysql
@@ -1,6 +1,4 @@
/**
- * $Id: create_site_tables.mysql,v 1.2 2003/11/13 16:57:47 mdb Exp $
- *
* Creates the necessary database tables in MySQL for the JDBC table site
* identifier.
*/
diff --git a/src/main/sql/create_user_tables.mysql b/src/main/sql/create_user_tables.mysql
index ed0046f7..7e46a3cf 100644
--- a/src/main/sql/create_user_tables.mysql
+++ b/src/main/sql/create_user_tables.mysql
@@ -1,6 +1,4 @@
/**
- * $Id: create_user_tables.mysql,v 1.3 2001/11/01 01:49:12 mdb Exp $
- *
* Creates the necessary database tables in MySQL for the user repository.
*/
diff --git a/src/test/java/com/samskivert/io/StreamUtilTest.java b/src/test/java/com/samskivert/io/StreamUtilTest.java
index cc17f86b..764136f4 100644
--- a/src/test/java/com/samskivert/io/StreamUtilTest.java
+++ b/src/test/java/com/samskivert/io/StreamUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java b/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java
index e02242e5..594ee55b 100644
--- a/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java
+++ b/src/test/java/com/samskivert/jdbc/HsqldbLiaisonTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
index ab8da81f..6d99deb7 100644
--- a/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
+++ b/src/test/java/com/samskivert/servlet/SiteResourceLoaderTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/swing/AdjustTestApp.java b/src/test/java/com/samskivert/swing/AdjustTestApp.java
index ae1f4a71..825bdd22 100644
--- a/src/test/java/com/samskivert/swing/AdjustTestApp.java
+++ b/src/test/java/com/samskivert/swing/AdjustTestApp.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/swing/LabelDemo.java b/src/test/java/com/samskivert/swing/LabelDemo.java
index 6a2f9616..8a38be36 100644
--- a/src/test/java/com/samskivert/swing/LabelDemo.java
+++ b/src/test/java/com/samskivert/swing/LabelDemo.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/swing/ProximityTrackerTest.java b/src/test/java/com/samskivert/swing/ProximityTrackerTest.java
index cfeb39c8..80101a73 100644
--- a/src/test/java/com/samskivert/swing/ProximityTrackerTest.java
+++ b/src/test/java/com/samskivert/swing/ProximityTrackerTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/swing/TestComboButtonBox.java b/src/test/java/com/samskivert/swing/TestComboButtonBox.java
index 8b738d91..8ad0284e 100644
--- a/src/test/java/com/samskivert/swing/TestComboButtonBox.java
+++ b/src/test/java/com/samskivert/swing/TestComboButtonBox.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/ArrayIntSetTest.java b/src/test/java/com/samskivert/util/ArrayIntSetTest.java
index 93f80c8d..e8b50a81 100644
--- a/src/test/java/com/samskivert/util/ArrayIntSetTest.java
+++ b/src/test/java/com/samskivert/util/ArrayIntSetTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/ArrayUtilTest.java b/src/test/java/com/samskivert/util/ArrayUtilTest.java
index 04f06ff6..d479bfa0 100644
--- a/src/test/java/com/samskivert/util/ArrayUtilTest.java
+++ b/src/test/java/com/samskivert/util/ArrayUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/CheapIntMapTest.java b/src/test/java/com/samskivert/util/CheapIntMapTest.java
index 0162f8cf..d20089af 100644
--- a/src/test/java/com/samskivert/util/CheapIntMapTest.java
+++ b/src/test/java/com/samskivert/util/CheapIntMapTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/CollectionUtilTest.java b/src/test/java/com/samskivert/util/CollectionUtilTest.java
index 161e5441..5fe4c4bd 100644
--- a/src/test/java/com/samskivert/util/CollectionUtilTest.java
+++ b/src/test/java/com/samskivert/util/CollectionUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/ConfigTest.java b/src/test/java/com/samskivert/util/ConfigTest.java
index 9db37ee3..af6638eb 100644
--- a/src/test/java/com/samskivert/util/ConfigTest.java
+++ b/src/test/java/com/samskivert/util/ConfigTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/ConfigUtilTest.java b/src/test/java/com/samskivert/util/ConfigUtilTest.java
index 74453938..0f53d6b1 100644
--- a/src/test/java/com/samskivert/util/ConfigUtilTest.java
+++ b/src/test/java/com/samskivert/util/ConfigUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/FoldsTest.java b/src/test/java/com/samskivert/util/FoldsTest.java
index 4e0a3547..4ae7e4ca 100644
--- a/src/test/java/com/samskivert/util/FoldsTest.java
+++ b/src/test/java/com/samskivert/util/FoldsTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/HashIntMapTest.java b/src/test/java/com/samskivert/util/HashIntMapTest.java
index 631e0bc3..be98c748 100644
--- a/src/test/java/com/samskivert/util/HashIntMapTest.java
+++ b/src/test/java/com/samskivert/util/HashIntMapTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/HashIntSetTest.java b/src/test/java/com/samskivert/util/HashIntSetTest.java
index 1756fe15..5084695b 100644
--- a/src/test/java/com/samskivert/util/HashIntSetTest.java
+++ b/src/test/java/com/samskivert/util/HashIntSetTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/IntListUtilTest.java b/src/test/java/com/samskivert/util/IntListUtilTest.java
index 933c763d..829fa65f 100644
--- a/src/test/java/com/samskivert/util/IntListUtilTest.java
+++ b/src/test/java/com/samskivert/util/IntListUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/IntSetTestBase.java b/src/test/java/com/samskivert/util/IntSetTestBase.java
index fb9d54b5..72c5c46d 100644
--- a/src/test/java/com/samskivert/util/IntSetTestBase.java
+++ b/src/test/java/com/samskivert/util/IntSetTestBase.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/LRUHashMapTest.java b/src/test/java/com/samskivert/util/LRUHashMapTest.java
index 899a1803..01fc2bec 100644
--- a/src/test/java/com/samskivert/util/LRUHashMapTest.java
+++ b/src/test/java/com/samskivert/util/LRUHashMapTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/ObserverListTest.java b/src/test/java/com/samskivert/util/ObserverListTest.java
index 39efed00..ee75000a 100644
--- a/src/test/java/com/samskivert/util/ObserverListTest.java
+++ b/src/test/java/com/samskivert/util/ObserverListTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/QuickSortTest.java b/src/test/java/com/samskivert/util/QuickSortTest.java
index 9610db62..d91ac053 100644
--- a/src/test/java/com/samskivert/util/QuickSortTest.java
+++ b/src/test/java/com/samskivert/util/QuickSortTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/RunnablesTest.java b/src/test/java/com/samskivert/util/RunnablesTest.java
index e199a541..2bd02970 100644
--- a/src/test/java/com/samskivert/util/RunnablesTest.java
+++ b/src/test/java/com/samskivert/util/RunnablesTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/SerialExecutorTest.java b/src/test/java/com/samskivert/util/SerialExecutorTest.java
index decaf2b9..179e33d2 100644
--- a/src/test/java/com/samskivert/util/SerialExecutorTest.java
+++ b/src/test/java/com/samskivert/util/SerialExecutorTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/StringUtilTest.java b/src/test/java/com/samskivert/util/StringUtilTest.java
index 7ee95b5a..296a4195 100644
--- a/src/test/java/com/samskivert/util/StringUtilTest.java
+++ b/src/test/java/com/samskivert/util/StringUtilTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/SystemInfoDemo.java b/src/test/java/com/samskivert/util/SystemInfoDemo.java
index ddbfab58..badd1e52 100644
--- a/src/test/java/com/samskivert/util/SystemInfoDemo.java
+++ b/src/test/java/com/samskivert/util/SystemInfoDemo.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/util/ThrottleTest.java b/src/test/java/com/samskivert/util/ThrottleTest.java
index 020edb76..f2bed40c 100644
--- a/src/test/java/com/samskivert/util/ThrottleTest.java
+++ b/src/test/java/com/samskivert/util/ThrottleTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/velocity/VelocityTest.java b/src/test/java/com/samskivert/velocity/VelocityTest.java
index f149d66b..8c1c173b 100644
--- a/src/test/java/com/samskivert/velocity/VelocityTest.java
+++ b/src/test/java/com/samskivert/velocity/VelocityTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/java/com/samskivert/xml/SetFieldRuleTest.java b/src/test/java/com/samskivert/xml/SetFieldRuleTest.java
index dae06e95..4f3ffd17 100644
--- a/src/test/java/com/samskivert/xml/SetFieldRuleTest.java
+++ b/src/test/java/com/samskivert/xml/SetFieldRuleTest.java
@@ -1,6 +1,4 @@
//
-// $Id$
-//
// samskivert library - useful routines for java programs
// Copyright (C) 2001-2011 Michael Bayne, et al.
//
diff --git a/src/test/resources/util/child.properties b/src/test/resources/util/child.properties
index 1f4024aa..7416e54c 100644
--- a/src/test/resources/util/child.properties
+++ b/src/test/resources/util/child.properties
@@ -1,6 +1,4 @@
#
-# $Id: test.properties,v 1.3 2002/11/25 22:23:21 mdb Exp $
-#
# A test properties file
_extends = util/parent.properties
diff --git a/src/test/resources/util/grandparent.properties b/src/test/resources/util/grandparent.properties
index 6955ec29..ec3b4a5f 100644
--- a/src/test/resources/util/grandparent.properties
+++ b/src/test/resources/util/grandparent.properties
@@ -1,6 +1,4 @@
#
-# $Id: grandparent.properties,v 1.1 2002/11/25 22:23:21 mdb Exp $
-#
# A test properties file
sub.sub1 = 5
diff --git a/src/test/resources/util/parent.properties b/src/test/resources/util/parent.properties
index 0abb0f60..b3f39b4a 100644
--- a/src/test/resources/util/parent.properties
+++ b/src/test/resources/util/parent.properties
@@ -1,6 +1,4 @@
#
-# $Id: parent.properties,v 1.1 2002/11/25 22:23:21 mdb Exp $
-#
# A test properties file
_extends = util/grandparent.properties
diff --git a/src/test/resources/util/test.properties b/src/test/resources/util/test.properties
index 2f8ebbe7..2fc552ce 100644
--- a/src/test/resources/util/test.properties
+++ b/src/test/resources/util/test.properties
@@ -1,6 +1,4 @@
#
-# $Id: test.properties,v 1.3 2002/11/25 22:23:21 mdb Exp $
-#
# A test properties file
sub.sub1 = 5