diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentproperties/HTMLContentProperties.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentproperties/HTMLContentProperties.java
index 4c7a41b..f76fd8e 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentproperties/HTMLContentProperties.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/contentproperties/HTMLContentProperties.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -172,7 +172,7 @@
 			IProject project = resource.getProject();
 			if (project != null) {
 				Preferences preferences = getPreferences(project, key, true);
-				if (value == null || value.trim().length() == 0)
+				if (value == null)
 					preferences.remove(getKeyFor(resource.getFullPath()));
 				else
 					preferences.put(getKeyFor(resource.getFullPath()), value);
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java
index 8f3ca14..457558f 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/document/HTMLDocumentTypeRegistry.java
@@ -40,15 +40,13 @@
 	private HTMLDocumentTypeEntry defaultWMLEntry = null;
 	private HTMLDocumentTypeEntry defaultCHTMLEntry = null;
 	private HTMLDocumentTypeEntry defaultHTML5Entry = null;
-	private HTMLDocumentTypeEntry defaultXHTML5Entry = null;
-
+	
 	final static int DEFAULT_HTML = 0;
 	final static int DEFAULT_XHTML = 1;
 	final static int DEFAULT_WML = 2;
 	final static int DEFAULT_CHTML = 3;
 	final static int DEFAULT_HTML5 = 4;
-	final static int DEFAULT_XHTML5 = 5;
-
+	
 	public static final String CHTML_PUBLIC_ID = "-//W3C//DTD Compact HTML 1.0 Draft//EN";//$NON-NLS-1$
 
 	/**
@@ -86,9 +84,6 @@
 		this.defaultHTML5Entry = new HTMLDocumentTypeEntry(name, publicId, null, null, false, false, displayName, false, false, false, true);
 		this.entries.put(publicId, this.defaultHTML5Entry);
 		
-		displayName = "XHTML5"; //$NON-NLS-1$
-		this.defaultXHTML5Entry = new HTMLDocumentTypeEntry(name, publicId, null, null, true, false, displayName, true, false, false, true);
-		this.entries.put("xmlns", this.defaultXHTML5Entry);
 		
 
 		HTMLDocumentTypeRegistryReader reader = new HTMLDocumentTypeRegistryReader();
@@ -121,9 +116,6 @@
 			case DEFAULT_HTML5 :
 				entry = this.defaultHTML5Entry;
 				break;
-			case DEFAULT_XHTML5 :
-				entry = this.defaultXHTML5Entry;
-				break;
 			case DEFAULT_XHTML :
 				entry = this.defaultXHTMLEntry;
 				break;
diff --git a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index 2556c77..9ccacd3 100644
--- a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
-Bundle-Version: 1.0.502.qualifier
+Bundle-Version: 1.0.503.qualifier
 Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java
index 7f0d67e..76c3a7d 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentproperties/ui/WebContentSettingsPropertyPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -213,7 +213,7 @@
 	private void initializeDoctypeValues() {
 		int index = 0;
 		String doctype = HTMLContentProperties.getProperty(HTMLContentProperties.DOCUMENT_TYPE, getResource(), false);
-		if (doctype != null && doctype.length() > 0) {
+		if (doctype != null) {
 			/*
 			 * If item is already part of combo, select it. Otherwise, select
 			 * none.
@@ -359,7 +359,7 @@
 		int index = fDocumentTypeCombo.getSelectionIndex();
 		if (index > -1) {
 			String id = (String) fDocumentTypeIds.get(index);
-			if (id == null || id.length() == 0 || id.equalsIgnoreCase(SELECT_NONE)) {
+			if (id == null || id.equalsIgnoreCase(SELECT_NONE)) {
 				// if none, use null
 				id = null;
 			}