diff --git a/lib/decoder.tmpl b/lib/decoder.tmpl
index 44bf8923d..c689b74d3 100644
--- a/lib/decoder.tmpl
+++ b/lib/decoder.tmpl
@@ -9,10 +9,6 @@ import [% import %];
 
 /**
  * Dispatches calls to a {@link [% name %]Receiver} instance.
- *
- * <p> Generated from <code>
- * $Id: decoder.tmpl,v 1.3 2002/08/20 19:34:06 mdb Exp $
- * </code>
  */
 public class [% name %]Decoder extends InvocationDecoder
 {
diff --git a/lib/dispatcher.tmpl b/lib/dispatcher.tmpl
index 5cd923ba5..066003f45 100644
--- a/lib/dispatcher.tmpl
+++ b/lib/dispatcher.tmpl
@@ -9,10 +9,6 @@ import [% import %];
 
 /**
  * Dispatches requests to the {@link [% name %]Provider}.
- *
- * <p> Generated from <code>
- * $Id: dispatcher.tmpl,v 1.3 2002/08/20 19:34:06 mdb Exp $
- * </code>
  */
 public class [% name %]Dispatcher extends InvocationDispatcher
 {
@@ -50,4 +46,6 @@ public class [% name %]Dispatcher extends InvocationDispatcher
             super.dispatchRequest(source, methodId, args);
         }
     }
+
+    // Generated on [% genstamp %].
 }
diff --git a/lib/marshaller.tmpl b/lib/marshaller.tmpl
index 0d6b65c36..ae445098e 100644
--- a/lib/marshaller.tmpl
+++ b/lib/marshaller.tmpl
@@ -13,10 +13,6 @@ import [% import %];
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
- *
- * <p> Generated from <code>
- * $Id: marshaller.tmpl,v 1.3 2002/08/20 19:34:06 mdb Exp $
- * </code>
  */
 public class [% name %]Marshaller extends InvocationMarshaller
     implements [% name %]Service
@@ -75,5 +71,5 @@ public class [% name %]Marshaller extends InvocationMarshaller
     }
 
 [% END -%]
-    // Class file generated on [% genstamp %].
+    // Generated on [% genstamp %].
 }
diff --git a/lib/sender.tmpl b/lib/sender.tmpl
index e5c4850e2..27d698154 100644
--- a/lib/sender.tmpl
+++ b/lib/sender.tmpl
@@ -10,10 +10,6 @@ import [% import %];
 /**
  * Used to issue notifications to a {@link [% name %]Receiver} instance on a
  * client.
- *
- * <p> Generated from <code>
- * $Id: sender.tmpl,v 1.3 2002/08/20 19:34:06 mdb Exp $
- * </code>
  */
 public class [% name %]Sender extends InvocationSender
 {