diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java
index 46f03cf60..c0cf470ad 100644
--- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java
+++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java
@@ -6,10 +6,6 @@
  */
 package com.arsdigita.portlet.bookmarks;
 
-import com.arsdigita.bebop.Label;
-import com.arsdigita.globalization.GlobalizedMessage;
-import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil;
-
 /**
  * @author cgyg9330
  *
@@ -17,10 +13,7 @@ import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil;
  * 
  */
  
-public interface BookmarkConstants {
-	
-	public static final String BUNDLE_NAME = "com.arsdigita.portlet.bookmarks.ui.BookmarkResources";
-   		
+public interface BookmarkConstants {	
 	
 	// bookmark portlet attributes
 	public static final String BOOKMARKS = "bookmarks";
@@ -42,23 +35,4 @@ public interface BookmarkConstants {
 	public static final String URL_ATTRIBUTE = "url";
 	public static final String WINDOW_ATTRIBUTE = "target-window";
 	
-	
-	// editing
-	
-	public static final GlobalizedMessage NO_BOOKMARKS_YET = GlobalizationUtil.globalize("bookmarks.header.no-bookmarks");
-	public static final GlobalizedMessage EXISTING_BOOKMARKS = GlobalizationUtil.globalize("bookmarks.header.existing-bookmarks");
-	public static final GlobalizedMessage NEW_WINDOW = GlobalizationUtil.globalize("bookmarks.new-window");
-	public static final Label ADD_NEW_BOOKMARK_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD);
-	public static final Label TITLE_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD);
-	public static final Label DESCRIPTION_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD);
-	public static final Label URL_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD);
-	
-	// errors
-	
-	public static final String NO_URL = (String)new GlobalizedMessage("bookmarks.error.no-url", BUNDLE_NAME).localize();
-	public static final String NO_TITLE = (String)new GlobalizedMessage("bookmarks.error.no-title", BUNDLE_NAME).localize();
-	public static final String CONTENT_ITEM_NOT_FOUND = (String)new GlobalizedMessage("bookmarks.error.content-item-not-found", BUNDLE_NAME).localize();
-	public static final String CONTENT_ITEM_NOT_AVAILABLE = (String)new GlobalizedMessage("bookmarks.warning.item-not-available", BUNDLE_NAME).localize();
-		
-
 }
diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java
index 35aedc0d4..a952a88de 100644
--- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java
+++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java
@@ -248,14 +248,18 @@ public class BookmarksPortletEditor
         add(m_existingBookmarks, ColumnPanel.FULL_WIDTH);
         add(new HorizontalLine(), ColumnPanel.FULL_WIDTH);
 
-        add(new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD), ColumnPanel.FULL_WIDTH);
-        add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD), ColumnPanel.RIGHT);
+        add(new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD), 
+                ColumnPanel.FULL_WIDTH);
+        add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD), 
+                ColumnPanel.RIGHT);
         add(m_title);
-        add(new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD), ColumnPanel.RIGHT);
+        add(new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD), 
+                ColumnPanel.RIGHT);
         add(m_description);
 
 
-        add(new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD), ColumnPanel.RIGHT);
+        add(new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD), 
+                ColumnPanel.RIGHT);
         add(m_url);
         add(new Label("")); // fill up the left hand column
         add(m_newWindow);