*** empty log message ***
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
index 61caf2c..b30ba1f 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
@@ -7,13 +7,9 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.jsdt.web.core.internal;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.contentproperties;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.contenttype;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.encoding;x-friends:="org.eclipse.wst.jsdt.web.ui",
  org.eclipse.wst.jsdt.web.core.internal.java;x-friends:="org.eclipse.wst.jsdt.web.ui",
  org.eclipse.wst.jsdt.web.core.internal.java.search;x-friends:="org.eclipse.wst.jsdt.web.ui",
  org.eclipse.wst.jsdt.web.core.internal.modelhandler;x-friends:="org.eclipse.wst.jsdt.web.ui",
- org.eclipse.wst.jsdt.web.core.internal.preferences;x-friends:="org.eclipse.wst.jsdt.web.ui",
  org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype;x-friends:="org.eclipse.wst.jsdt.web.ui",
  org.eclipse.wst.jsdt.web.core.internal.provisional.text;x-friends:="org.eclipse.wst.jsdt.web.ui",
  org.eclipse.wst.jsdt.web.core.internal.tasks;x-friends:="org.eclipse.wst.jsdt.web.ui",
@@ -31,7 +27,7 @@
  org.eclipse.wst.jsdt.core,
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.wst.jsdt.ui
-Eclipse-LazyStart: true; exceptions="org.eclipse.wst.jsdt.web.core.internal.contenttype"
+Eclipse-LazyStart: true
 Import-Package: org.eclipse.swt.widgets,
  org.eclipse.wst.common.componentcore,
  org.eclipse.wst.common.componentcore.internal.util,
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
index 042d55b..d1836bc 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
@@ -26,7 +26,7 @@
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 
-import com.sun.org.apache.xalan.internal.xsltc.runtime.Hashtable;
+import java.util.Hashtable;
 
 /**
  * Copyright IBM 2007. All rights reserved. This class maintains resource change
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
index df5988e..e104da9 100644
--- a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@
  org.eclipse.wst.jsdt.web.ui.internal;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.autoedit;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.contentassist;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.contentproperties.ui;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.derived;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.editor;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.format;x-internal:=true,
@@ -18,9 +17,6 @@
  org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.java.search;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.java.search.ui;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.preferences;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.preferences.ui;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.projection;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.registry;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.style;x-internal:=true,
  org.eclipse.wst.jsdt.web.ui.internal.style.java;x-internal:=true,