diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java
index 76eb8c113..c319e4ea2 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/SectionEditForm.java
@@ -23,7 +23,6 @@ import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.Label;
-import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SaveCancelSection;
 import com.arsdigita.bebop.event.FormInitListener;
@@ -33,7 +32,6 @@ import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.form.TextField;
 import com.arsdigita.bebop.form.CheckboxGroup;
 import com.arsdigita.bebop.form.Option;
-import com.arsdigita.bebop.parameters.LongParameter;
 import com.arsdigita.bebop.parameters.NotNullValidationListener;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.bebop.parameters.TrimmedStringParameter;
@@ -73,8 +71,6 @@ public class SectionEditForm extends Form {
     private final SectionSelectionModel<? extends MultiPartArticleSection> selectedSectionModel;
     private final StringParameter selectedLanguageParam;
 
-    private LongParameter textParameter;
-    private ItemSelectionModel selectedTextModel;
     private MultiPartArticleSectionsStep sectionsStep;
 
     private SaveCancelSection saveCancelSection;
@@ -181,11 +177,6 @@ public class SectionEditForm extends Form {
         return section;
     }
 
-    @Override
-    public void register(final Page page) {
-        super.register(page);
-        page.addGlobalStateParam(textParameter);
-    }
 
     /**
      * Initialise the form. If there is a selected section, ie. this is an
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
index 9b0fb7efc..8c9d8bac8 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Article.java
@@ -34,6 +34,7 @@ import javax.persistence.Table;
 
 import org.hibernate.envers.Audited;
 import org.libreccm.l10n.LocalizedString;
+import org.librecms.CmsConstants;
 
 import static org.librecms.CmsConstants.*;
 
@@ -53,17 +54,17 @@ import org.librecms.contentsection.ContentItem;
     steps = {
         @AuthoringStep(
             component = ArticlePropertiesStep.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.basic_properties"
                                  + ".description",
             order = 1),
         @AuthoringStep(
             component = ArticleTextBody.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.body_text.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.body_text.description",
             order = 2
         )
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java b/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java
index d084c8278..3c2e94091 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/Event.java
@@ -39,6 +39,7 @@ import javax.persistence.TemporalType;
 import org.hibernate.envers.Audited;
 
 import org.libreccm.l10n.LocalizedString;
+import org.librecms.CmsConstants;
 
 import org.librecms.contentsection.ContentItem;
 
@@ -60,18 +61,18 @@ import static org.librecms.CmsConstants.*;
     steps = {
         @AuthoringStep(
             component = EventPropertiesStep.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.basic_properties"
                                  + ".description",
             order = 1)
         ,
         @AuthoringStep(
             component = EventTextBody.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.body_text.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.body_text.description",
             order = 2
         )
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java
index ac59a52cb..6771fa08b 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java
@@ -24,6 +24,7 @@ import com.arsdigita.cms.ui.authoring.multipartarticle.MultiPartArticleSectionsS
 
 import org.hibernate.envers.Audited;
 import org.libreccm.l10n.LocalizedString;
+import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItem;
 
 import java.io.Serializable;
@@ -59,19 +60,18 @@ import static org.librecms.CmsConstants.*;
     steps = {
         @AuthoringStep(
             component = MultiPartArticleEdit.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.basic_properties"
                                  + ".description",
             order = 1)
         ,
         @AuthoringStep(
             component = MultiPartArticleSectionsStep.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.body_text.title",
-            descriptionBundle
-                = "com.arsdigita.cms.contenttypes.MultiPartArticleResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "mparticle.authoring.body_text.description",
             order = 2)
     })
diff --git a/ccm-cms/src/main/java/org/librecms/contenttypes/News.java b/ccm-cms/src/main/java/org/librecms/contenttypes/News.java
index a9765be2b..d6125acb9 100644
--- a/ccm-cms/src/main/java/org/librecms/contenttypes/News.java
+++ b/ccm-cms/src/main/java/org/librecms/contenttypes/News.java
@@ -24,6 +24,7 @@ import com.arsdigita.cms.ui.contenttypes.NewsCreateForm;
 
 import org.hibernate.envers.Audited;
 import org.libreccm.l10n.LocalizedString;
+import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItem;
 
 import java.io.Serializable;
@@ -57,18 +58,18 @@ import static org.librecms.CmsConstants.*;
     steps = {
         @AuthoringStep(
             component = NewsPropertiesStep.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.basic_properties"
                                  + ".description",
             order = 1)
         ,
         @AuthoringStep(
             component = NewsTextBody.class,
-            labelBundle = "org.librecms.CmsResources",
+            labelBundle = CmsConstants.CMS_BUNDLE,
             labelKey = "cms.contenttypes.shared.body_text.title",
-            descriptionBundle = "org.librecms.CmsResources",
+            descriptionBundle = CmsConstants.CMS_BUNDLE,
             descriptionKey = "cms.contenttypes.shared.body_text.description",
             order = 2
         )