diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade
index 1ac7ff88d..ffa759a07 100755
--- a/ccm-cms/src/ccm-cms.upgrade
+++ b/ccm-cms/src/ccm-cms.upgrade
@@ -1,4 +1,5 @@
 <upgrade>
+
   <version from="6.0.0" to="6.0.1">
     <script sql="ccm-cms/upgrade/::database::-6.0.0-6.0.1.sql"/>
   </version>
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java
index 3e948bd0f..c7bf0dda1 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java
@@ -55,16 +55,11 @@ import java.util.List;
  * that can be used by content types to reduce code duplication.
  *
  * @author Rafael H. Schloming &lt;rhs@mit.edu&gt;
- * @version $Revision: #12 $ $Date: 2004/08/17 $
+ * @version $Revision: #754 $ $Date: 2005/09/02 $ $Author: sskracic $
  **/
 
 public abstract class AbstractContentTypeLoader extends PackageLoader {
 
-    public final static String versionId = 
-        "$Id: AbstractContentTypeLoader.java 754 2005-09-02 13:26:17Z sskracic $" +
-        " by $Author: sskracic $, " +
-        "$DateTime: 2004/08/17 23:15:09 $";
-
     public void run(final ScriptContext ctx) {
         new KernelExcursion() {
             protected void excurse() {
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java
index a1487873f..18005c926 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java
@@ -36,12 +36,10 @@ import java.math.BigDecimal;
  *
  * @author Randy Graebner (randyg@redhat.com)
  *
- * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: ContentGroup.java 287 2005-02-22 00:29:02Z sskracic $
  */
 public class ContentGroup extends ContentItem {
 
-    public static final String versionId = "$Id: ContentGroup.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     public static final String BASE_DATA_OBJECT_TYPE = 
         "com.arsdigita.cms.contenttypes.ContentGroup";
 
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java
index 05df20b34..e5b761cca 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java
@@ -39,12 +39,10 @@ import com.arsdigita.util.Assert;
  *
  * @author Randy Graebner (randyg@redhat.com)
  *
- * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: ContentGroupAssociation.java 287 2005-02-22 00:29:02Z sskracic $
  */
 public class ContentGroupAssociation extends ContentItem {
 
-    protected static final String versionId = "$Id: ContentGroupAssociation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     public static final String BASE_DATA_OBJECT_TYPE =
         "com.arsdigita.cms.contenttypes.ContentGroupAssociation";
 
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java
index 114f1ef1b..2d5155971 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java
@@ -48,12 +48,13 @@ import java.math.BigDecimal;
 
 
 /**
- *  This displays a sortable list of items within a given content group
+ * This displays a sortable list of items within a given content group
+ *
+ * @version $Id: ContentGroupItemList.java 287 2005-02-22 00:29:02Z sskracic $ 
  */
 class ContentGroupItemList extends SortableList {
 
-    public static final String versionId = "$Id: ContentGroupItemList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
+ 
     private static final org.apache.log4j.Logger s_log =
         org.apache.log4j.Logger.getLogger(ContentGroupItemList.class);
 
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java
index ef79f63e2..b8527f977 100755
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java
@@ -36,11 +36,10 @@ import java.math.BigDecimal;
  * be nice about it.
  *
  * @author Hugh Brock (hbrock@redhat.com)
+ * @version $Id: ImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $
  */
 public class ImageDisplay extends SimpleComponent {
 
-    public static final String versionId = "$Id: ImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     private final ItemSelectionModel m_item;
 
     /**
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
index 4c541c1ac..9432f0776 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java
@@ -37,8 +37,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletException;
 
+/**
+ *
+ * @version $Id: BaseAsset.java 1571 2007-04-20 15:57:54Z apevec $
+ */
 class BaseAsset extends ResourceHandlerImpl {
-    public static final String versionId = "$Id: BaseAsset.java 1571 2007-04-20 15:57:54Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $";
 
     private static final Logger s_log = Logger.getLogger(BaseAsset.class);
 
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java
index 349f7b937..f9d0d29ff 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java
@@ -101,15 +101,10 @@ import org.apache.log4j.Logger;
  * @author Michael Pih (pihman@arsdigita.com)
  * @author Uday Mathur (umathur@arsdigita.com)
  * @author Jack Chung (flattop@arsdigita.com)
- * @version $Revision: #26 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: CMSDispatcher.java 1795 2009-02-07 10:47:32Z pboy $
  */
 public class CMSDispatcher implements Dispatcher, ChainedDispatcher {
 
-    public static final String versionId = 
-            "$Id: CMSDispatcher.java 1795 2009-02-07 10:47:32Z pboy $" +
-            " by $Author: pboy $, " +
-            "$DateTime: 2004/08/17 23:15:09 $";
-
     private static Logger s_log =
         Logger.getLogger(CMSDispatcher.class);
 
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java
index ecf58a396..913edc939 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java
@@ -68,13 +68,9 @@ import org.apache.log4j.Logger;
  *
  * @author Michael Pih (pihman@arsdigita.com)
  * @author Uday Mathur (umathur@arsdigita.com)
- * @version $Revision: #30 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: CMSPage.java 1312 2006-09-04 11:26:55Z sskracic $
  */
 public class CMSPage extends Page implements ResourceHandler {
-    public static final String versionId =
-        "$Id: CMSPage.java 1312 2006-09-04 11:26:55Z sskracic $" +
-        "$Author: sskracic $" +
-        "$DateTime: 2004/08/17 23:15:09 $";
 
     private static final Logger s_log = Logger.getLogger(CMSPage.class);
 
@@ -289,7 +285,6 @@ public class CMSPage extends Page implements ResourceHandler {
                                 throw new AccessDeniedException(
                                   "You do not have privileges to administer item " + itemID);
                             }
-			    
                         } catch (DataObjectNotFoundException donfe) {
                             s_log.warn("Failed to load content item " + itemID);
                         }
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java
index 48cd1b35a..fc320cc98 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java
@@ -22,12 +22,10 @@ package com.arsdigita.cms.dispatcher;
  * <p>An interface for caching objects.</p>
  *
  * @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: Cache.java 287 2005-02-22 00:29:02Z sskracic $
  */
 public interface Cache {
 
-    public static final String versionId = "$Id: Cache.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     /**
      * Lookup and fetch a cached object.
      *
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java
index 7224f6d29..246ea052b 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java
@@ -66,13 +66,11 @@ import org.apache.log4j.Logger;
  * </ol>
  *
  * @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: #18 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: ContentCenterDispatcher.java 287 2005-02-22 00:29:02Z sskracic $
  */
 public class ContentCenterDispatcher extends LockableImpl
     implements Dispatcher {
 
-    public static final String versionId = "$Id: ContentCenterDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     /**
      * The path of the file that maps resources.
      */
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java
index 76ba78469..84065b4a4 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java
@@ -40,12 +40,10 @@ import javax.servlet.http.HttpServletRequest;
  *
  *
  * @author Karl Goldstein (karlg@arsdigita.com)
- * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: TemplateResolver.java 287 2005-02-22 00:29:02Z sskracic $
  **/
 public interface TemplateResolver {
 
-    public static final String versionId = "$Id: TemplateResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     /**
      * Returns the JSP template filename relative to the webapp
      * root.
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java
index 1c6b1e732..2f5025c30 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java
@@ -50,12 +50,10 @@ import java.util.Map;
  * System.</p>
  *
  * @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: 1.1.2.2 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: Utilities.java 1546 2007-03-28 14:28:57Z chrisgilbert23 $
  */
 public class Utilities {
 
-    public static final String versionId = "$Id: Utilities.java 1546 2007-03-28 14:28:57Z chrisgilbert23 $ by $Author: chrisgilbert23 $, $DateTime: 2004/08/17 23:15:09 $";
-
     public final static String CMS_WORKSPACE = WorkspaceInstaller.PACKAGE_KEY;
     public final static String CMS_SERVICE = ServiceInstaller.PACKAGE_KEY;
 
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java
index e1e7a87fc..ed494dc27 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java
@@ -36,12 +36,10 @@ import com.arsdigita.xml.Element;
  * formats it as an XML document.</p>
  *
  * @author Michael Pih (pihman@arsdigita.com)
- * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $
+ * @version $Id: XMLGenerator.java 287 2005-02-22 00:29:02Z sskracic $
  */
 public interface XMLGenerator {
 
-    public static final String versionId = "$Id: XMLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
-
     /**
      * Generates the XML to render the content panel.
      *
diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html b/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html
index 8ae3d4235..ffa436307 100755
--- a/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html
+++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html
@@ -38,5 +38,7 @@
     phase becomes active. The duration is the length of time that the
     phase remains active.</p>
 
+    <p>Last modified:<br />$Id: $</p>
+
   </body>
 </html>