diff --git a/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java b/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java
index b7797031c..12b0cbf83 100755
--- a/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java
+++ b/ccm-cms-types-htmlform/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java
@@ -17,10 +17,10 @@ package com.arsdigita.cms.contenttypes;
 
 
 /**
- * The CMS initializer.
+ * The HTMLForm initializer.
  *
  * @author Justin Ross <jross@redhat.com>
- * @version $Id: //ps/apps/london/htmlform/dev/src/com/arsdigita/cms/contenttypes/HTMLFormInitializer.java#2 $
+ * @version $Id: com/arsdigita/cms/contenttypes/HTMLFormInitializer.java#2 $
  */
 public class HTMLFormInitializer extends ContentTypeInitializer {
 
@@ -29,7 +29,9 @@ public class HTMLFormInitializer extends ContentTypeInitializer {
     }
 
 
+    @Override
     public String[] getStylesheets() {
-        return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/HTMLForm.xsl" };
+        return new String[] { 
+            "/static/content-types/com/arsdigita/cms/contenttypes/HTMLForm.xsl" };
     }
 }
diff --git a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Initializer.java b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Initializer.java
index fbeef2a2f..1708d24ae 100755
--- a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Initializer.java
+++ b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Initializer.java
@@ -32,10 +32,6 @@ import com.arsdigita.runtime.RuntimeConfig;
  * @version $Id: Initializer.java 753 2005-09-02 13:22:34Z sskracic $
  */
 public class Initializer extends CompoundInitializer {
-    public final static String versionId =
-        "$Id: Initializer.java 753 2005-09-02 13:22:34Z sskracic $" +
-        "$Author: sskracic $" +
-        "$DateTime: 2003/10/13 13:33:53 $";
 
     public Initializer() {
         final String url = RuntimeConfig.getConfig().getJDBCURL();
diff --git a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
index 2a1eb48a0..d725db689 100755
--- a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
+++ b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
@@ -28,9 +28,6 @@ import com.arsdigita.runtime.RuntimeConfig;
 import com.arsdigita.runtime.Script;
 import com.arsdigita.runtime.ScriptContext;
 import com.arsdigita.runtime.Startup;
-// pboy (Jan.09) deprecated, replacement: c.ad.util.JavaPropertyReader
-//               comments should be deleted after exentsiv testing
-// import com.arsdigita.util.config.JavaPropertyLoader;
 import com.arsdigita.util.JavaPropertyReader;
 import com.arsdigita.util.jdbc.Connections;
 import java.sql.Connection;
@@ -43,10 +40,6 @@ import org.apache.log4j.Logger;
  * @version $Id: Loader.java 1763 2009-01-22 20:01:31Z pboy $
  */
 public class Loader extends PackageLoader {
-    public final static String versionId =
-        "$Id: Loader.java 1763 2009-01-22 20:01:31Z pboy $" +
-        "$Author: pboy $" +
-        "$DateTime: 2003/11/08 01:27:15 $";
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
diff --git a/ccm-ldn-subsite/src/com/arsdigita/london/subsite/Loader.java b/ccm-ldn-subsite/src/com/arsdigita/london/subsite/Loader.java
index 10879b46f..06853e7cd 100755
--- a/ccm-ldn-subsite/src/com/arsdigita/london/subsite/Loader.java
+++ b/ccm-ldn-subsite/src/com/arsdigita/london/subsite/Loader.java
@@ -44,13 +44,14 @@ public class Loader extends PackageLoader {
         new KernelExcursion() {
             public void excurse() {
                 setEffectiveParty(Kernel.getSystemParty());
+                
                 createApplication();
             }
         }.run();
     }
 
     /**
-     *  This creates and initializes the subsite application
+     *  This creates and initializes the subsite admin application
      */
     private void createApplication() {
         ApplicationType type = ApplicationType