clean-ups: unused code removed
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/DomEMFPackageImpl.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/DomEMFPackageImpl.java
index 32ca6b0..0119b69 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/DomEMFPackageImpl.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/DomEMFPackageImpl.java
@@ -11,7 +11,6 @@
 package org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl;
 
 import java.io.Serializable;
-
 import java.util.Set;
 
 import org.eclipse.emf.ecore.EAttribute;
@@ -21,15 +20,10 @@
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.DomEMFFactory;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.DomEMFPackage;
-
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Content;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Position;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXAttribute;
@@ -40,7 +34,6 @@
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXNode;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXProcessingInstruction;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Validator;
-
 import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Comment;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/VEXDocumentImpl.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/VEXDocumentImpl.java
index b19c79d..a53007c 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/VEXDocumentImpl.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/impl/VEXDocumentImpl.java
@@ -11,21 +11,14 @@
 package org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.wst.xml.vex.core.internal.dom.DocumentValidationException;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Content;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.DomEMFPackage;
-
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Content;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Position;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocumentFragment;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java
index d571857..2216d43 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src-emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/util/VEXModelTranslator.java
@@ -1,10 +1,5 @@
 package org.eclipse.wst.xml.vex.core.internal.provisional.dom.util;
 
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
 import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.DomEMFPackage;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
index 4a40d27..78650c7 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/css/StyleSheet.java
@@ -25,7 +25,6 @@
 import java.util.WeakHashMap;
 
 import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 import org.w3c.css.sac.LexicalUnit;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
index 9e5b351..13a1bf9 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentBuilder.java
@@ -14,19 +14,15 @@
 
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Content;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
index 15857c6..e8104e0 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentFragment.java
@@ -14,8 +14,6 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -25,8 +23,8 @@
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocumentFragment;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXNode;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl.VEXDocumentFragmentImpl;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Validator;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.impl.VEXDocumentFragmentImpl;
 
 /**
  * Represents a fragment of an XML document.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
index 3ab2994..a29e2d8 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/dom/Element.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.vex.core.internal.dom;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -19,13 +17,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.Content;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
index 3877c8d..06f7e79 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/AbstractBox.java
@@ -18,7 +18,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
 import org.eclipse.wst.xml.vex.core.internal.css.CSS;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
index 0a2625b..8b7f8df 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockElementBox.java
@@ -20,7 +20,6 @@
 import org.eclipse.wst.xml.vex.core.internal.css.CSS;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
index 1d48751..25686bb 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/BlockPseudoElementBox.java
@@ -14,7 +14,6 @@
 
 import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
index d99cbe3..a615a1f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/Box.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.wst.xml.vex.core.internal.core.Caret;
 import org.eclipse.wst.xml.vex.core.internal.core.Insets;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
index 8ffd16a..6a63952 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/DrawableBox.java
@@ -17,7 +17,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
 import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
index 951d422..ca0204a 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LayoutContext.java
@@ -12,7 +12,6 @@
 
 import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
index 10e67cb..d6b3257 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/LineBox.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.vex.core.internal.layout;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
index 8e5c441..f09d51f 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/ParagraphBox.java
@@ -18,7 +18,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
 import org.eclipse.wst.xml.vex.core.internal.css.CSS;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
index 4de60ad..b3c2220 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/PlaceholderBox.java
@@ -15,7 +15,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
 import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
index ccd21c9..e00ff78 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/RootBox.java
@@ -15,7 +15,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.Insets;
 import org.eclipse.wst.xml.vex.core.internal.core.IntRange;
 import org.eclipse.wst.xml.vex.core.internal.core.Rectangle;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
index 6e75900..8893a38 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/StaticTextBox.java
@@ -14,7 +14,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.FontResource;
 import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
index b58e4d4..a0a8870 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/layout/TextBox.java
@@ -17,7 +17,6 @@
 import org.eclipse.wst.xml.vex.core.internal.core.FontSpec;
 import org.eclipse.wst.xml.vex.core.internal.core.Graphics;
 import org.eclipse.wst.xml.vex.core.internal.css.Styles;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java
index 9b24b35..e14ee74 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/provisional/dom/IWhitespacePolicy.java
@@ -10,8 +10,7 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.vex.core.internal.provisional.dom;
 
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.*;
-
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
  * Determines whitespace policy for document elements. For example, a CSS
@@ -26,7 +25,7 @@
 	 * @param element
 	 *            Element to test.
 	 */
-	public boolean isBlock(org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement element);
+	boolean isBlock(VEXElement element);
 
 	/**
 	 * Returns true if the given element is pre-formatted, that is, all of its
@@ -35,5 +34,5 @@
 	 * @param element
 	 *            Element to test.
 	 */
-	public boolean isPre(org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement element);
+	boolean isPre(VEXElement element);
 }
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DFABuilder.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DFABuilder.java
deleted file mode 100644
index f1009cf..0000000
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DFABuilder.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     John Krasnay - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.validator;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-
-/**
- * Tools for building a deterministic finite automaton (DFA) recognizer for
- * regular expression-like languages.
- * @deprecated replaced with WTP Content Model
- */
-public class DFABuilder {
-
-	/**
-	 * Node represents a node in an abstract syntax tree. The first step to
-	 * creating a DFA is to build an AST using the given createXxx methods.
-	 */
-	public interface Node {
-		public void accept(NodeVisitor visitor);
-
-		public Object clone();
-
-		public Set getFirstPos();
-
-		public Set getLastPos();
-
-		public boolean isNullable();
-	}
-
-	/**
-	 * Create a node that represents a choice between two nodes.
-	 * 
-	 * @param child1
-	 *            first choice
-	 * @param child2
-	 *            second choice
-	 */
-	public static Node createChoiceNode(Node child1, Node child2) {
-		return new OrNode(child1, child2);
-	}
-
-	/**
-	 * Create a DFA given the root node of the syntax tree.
-	 * 
-	 * @return Initial state of the resulting DFA.
-	 * @param root
-	 *            Root node of the syntax tree.
-	 */
-	public static DFAState createDFA(Node root) {
-
-		// Append a sentinel to indicate accepting states.
-		SymbolNode sentinelNode = new SymbolNode(Sentinel.getInstance());
-		Node fakeRoot = new CatNode(root, sentinelNode);
-
-		// map symbol node set => state in the new DFA
-		Map stateMap = new HashMap();
-
-		// symbol node sets we have considered
-		Set marked = new HashSet();
-
-		// stack of symbol node sets we have yet to consider
-		Stack unmarked = new Stack();
-
-		// calculate followPos and symbolMap
-		FollowPosBuilder fpb = new FollowPosBuilder();
-		fakeRoot.accept(fpb);
-
-		// map symbol node => set of symbol nodes that follow it
-		Map followPos = fpb.getFollowPos();
-
-		// map symbol => set of symbol nodes that represent it
-		Map symbolMap = fpb.getSymbolMap();
-
-		Set nodeSet = fakeRoot.getFirstPos();
-		DFAState startState = new DFAState();
-		if (nodeSet.contains(sentinelNode)) {
-			startState.setAccepting(true);
-		}
-
-		stateMap.put(nodeSet, startState);
-
-		unmarked.push(nodeSet);
-
-		while (unmarked.size() > 0) {
-			nodeSet = (Set) unmarked.pop();
-			marked.add(nodeSet);
-			DFAState state = (DFAState) stateMap.get(nodeSet);
-			if (state == null) {
-				state = new DFAState();
-				stateMap.put(nodeSet, state);
-			}
-
-			Iterator iterSymbols = symbolMap.keySet().iterator();
-			while (iterSymbols.hasNext()) {
-				Object symbol = iterSymbols.next();
-				Set targetSet = new HashSet();
-				Iterator iterNodes = nodeSet.iterator();
-				while (iterNodes.hasNext()) {
-					SymbolNode node = (SymbolNode) iterNodes.next();
-					if (node.getSymbol().equals(symbol)) {
-						targetSet.addAll((Set) followPos.get(node));
-					}
-				}
-
-				if (!targetSet.isEmpty()) {
-					if (!unmarked.contains(targetSet)
-							&& !marked.contains(targetSet)) {
-
-						unmarked.push(targetSet);
-					}
-
-					DFAState targetState = (DFAState) stateMap.get(targetSet);
-
-					if (targetState == null) {
-						targetState = new DFAState();
-						if (targetSet.contains(sentinelNode)) {
-							targetState.setAccepting(true);
-						}
-						stateMap.put(targetSet, targetState);
-					}
-
-					state.addTransition(symbol, targetState);
-				}
-			}
-
-		}
-
-		return startState;
-	}
-
-	/**
-	 * Create optional node.
-	 * 
-	 * @param child
-	 *            Node that is optional.
-	 */
-	public static Node createOptionalNode(Node child) {
-		return new OrNode(child, new NullNode());
-	}
-
-	/**
-	 * Create a repeating node.
-	 * 
-	 * @param child
-	 *            Node that can be repeated.
-	 * @param minRepeat
-	 *            minimum number of times the node can be repeated.
-	 */
-	public static Node createRepeatingNode(Node child, int minRepeat) {
-		Node node = new StarNode(child);
-		for (int i = 0; i < minRepeat; i++) {
-			node = new CatNode(node, (Node) child.clone());
-		}
-		return node;
-	}
-
-	/**
-	 * Creates a node representing a sequence of two other nodes.
-	 * 
-	 * @param child1
-	 *            first node in the sequence.
-	 * @param child2
-	 *            second node in the sequence.
-	 */
-	public static Node createSequenceNode(Node child1, Node child2) {
-		return new CatNode(child1, child2);
-	}
-
-	/**
-	 * Create a node for a symbol.
-	 * 
-	 * @param symbol
-	 *            Symbol contained by the node.
-	 */
-	public static Node createSymbolNode(Object symbol) {
-		return new SymbolNode(symbol);
-	}
-
-	// ============================================================ PRIVATE
-
-	/**
-	 * Implementation of node that keeps firstPos, lastPos, and nullable as
-	 * instance variables. The accept method is undefined.
-	 */
-	private abstract static class AbstractNode implements Node {
-		protected Set firstPos;
-		protected Set lastPos;
-		protected boolean nullable;
-
-		public abstract Object clone();
-
-		public Set getFirstPos() {
-			return this.firstPos;
-		}
-
-		public Set getLastPos() {
-			return this.lastPos;
-		}
-
-		public boolean isNullable() {
-			return this.nullable;
-		}
-
-		protected Set union(Set set1, Set set2) {
-			Set retval = new HashSet();
-			retval.addAll(set1);
-			retval.addAll(set2);
-			return retval;
-		}
-	}
-
-	/**
-	 * Node representing a sequence of two nodes.
-	 */
-	private static class CatNode extends AbstractNode {
-		private Node leftChild;
-		private Node rightChild;
-
-		public CatNode(Node leftChild, Node rightChild) {
-			this.leftChild = leftChild;
-			this.rightChild = rightChild;
-
-			if (leftChild.isNullable()) {
-				this.firstPos = union(leftChild.getFirstPos(), rightChild
-						.getFirstPos());
-			} else {
-				this.firstPos = leftChild.getFirstPos();
-			}
-
-			if (rightChild.isNullable()) {
-				this.lastPos = union(leftChild.getLastPos(), rightChild
-						.getLastPos());
-			} else {
-				this.lastPos = rightChild.getLastPos();
-			}
-
-			this.nullable = leftChild.isNullable() && rightChild.isNullable();
-		}
-
-		public void accept(NodeVisitor visitor) {
-			leftChild.accept(visitor);
-			rightChild.accept(visitor);
-			visitor.visitCatNode(this);
-		}
-
-		public Object clone() {
-			return new CatNode((Node) this.leftChild.clone(),
-					(Node) this.rightChild.clone());
-		}
-
-		public Node getLeftChild() {
-			return this.leftChild;
-		}
-
-		public Node getRightChild() {
-			return this.rightChild;
-		}
-	}
-
-	/**
-	 * Builds the followPos function. The function is represented by a map from
-	 * symbol nodes to sets of symbol nodes that can follow them. Also generates
-	 * a map of symbols to sets of symbol nodes that represent them.
-	 */
-	private static class FollowPosBuilder implements NodeVisitor {
-		private Map followPos = new HashMap();
-		private Map symbolMap = new HashMap();
-
-		public Map getFollowPos() {
-			return this.followPos;
-		}
-
-		public Map getSymbolMap() {
-			return this.symbolMap;
-		}
-
-		public void visitCatNode(CatNode node) {
-			Iterator iter = node.getLeftChild().getLastPos().iterator();
-			while (iter.hasNext()) {
-				SymbolNode symbolNode = (SymbolNode) iter.next();
-				Set set = this.getFollowPos(symbolNode);
-				set.addAll(node.getRightChild().getFirstPos());
-			}
-		}
-
-		public void visitNullNode(NullNode node) {
-		}
-
-		public void visitOrNode(OrNode node) {
-		}
-
-		public void visitStarNode(StarNode node) {
-			Iterator iter = node.getChild().getLastPos().iterator();
-			while (iter.hasNext()) {
-				SymbolNode symbolNode = (SymbolNode) iter.next();
-				Set set = this.getFollowPos(symbolNode);
-				set.addAll(node.getChild().getFirstPos());
-			}
-		}
-
-		public void visitSymbolNode(SymbolNode node) {
-
-			// Done by getFollowPos(SymbolNode)
-			// this.followPos.put(node, new HashSet());
-
-			// Ensure we have an entry for this symbol
-			this.getFollowPos(node);
-
-			Object symbol = node.getSymbol();
-			Set symbolNodeSet = (Set) this.symbolMap.get(symbol);
-			if (symbolNodeSet == null) {
-				symbolNodeSet = new HashSet();
-				this.symbolMap.put(symbol, symbolNodeSet);
-			}
-			symbolNodeSet.add(node);
-		}
-
-		private Set getFollowPos(SymbolNode node) {
-			Set ret = (Set) this.followPos.get(node);
-			if (ret == null) {
-				ret = new HashSet();
-				this.followPos.put(node, ret);
-			}
-			return ret;
-		}
-
-	}
-
-	/**
-	 * Describes a visitor that can walk an AST.
-	 */
-	private interface NodeVisitor {
-		public void visitCatNode(CatNode node);
-
-		public void visitNullNode(NullNode node);
-
-		public void visitOrNode(OrNode node);
-
-		public void visitStarNode(StarNode node);
-
-		public void visitSymbolNode(SymbolNode node);
-	}
-
-	/**
-	 * Node representing nothing. It is used with OrNode to construct an
-	 * optional entry.
-	 */
-	private static class NullNode extends AbstractNode {
-		public NullNode() {
-			this.firstPos = Collections.EMPTY_SET;
-			this.lastPos = Collections.EMPTY_SET;
-			this.nullable = true;
-		}
-
-		public void accept(NodeVisitor visitor) {
-			visitor.visitNullNode(this);
-		}
-
-		public Object clone() {
-			return new NullNode();
-		}
-	}
-
-	/**
-	 * Node representing a choice between two alternatives.
-	 */
-	private static class OrNode extends AbstractNode {
-		private Node leftChild;
-		private Node rightChild;
-
-		public OrNode(Node leftChild, Node rightChild) {
-			this.leftChild = leftChild;
-			this.rightChild = rightChild;
-
-			this.firstPos = union(leftChild.getFirstPos(), rightChild
-					.getFirstPos());
-			this.lastPos = union(leftChild.getLastPos(), rightChild
-					.getLastPos());
-
-			this.nullable = leftChild.isNullable() || rightChild.isNullable();
-		}
-
-		public void accept(NodeVisitor visitor) {
-			leftChild.accept(visitor);
-			rightChild.accept(visitor);
-			visitor.visitOrNode(this);
-		}
-
-		public Object clone() {
-			return new OrNode((Node) this.leftChild.clone(),
-					(Node) this.rightChild.clone());
-		}
-
-		public Node getLeftChild() {
-			return this.leftChild;
-		}
-
-		public Node getRightChild() {
-			return this.rightChild;
-		}
-	}
-
-	/**
-	 * Symbol appended to the AST to mark accepting states.
-	 */
-	private static class Sentinel {
-		private static final Sentinel instance = new Sentinel();
-
-		private Sentinel() {
-		}
-
-		public static Sentinel getInstance() {
-			return instance;
-		}
-
-		public String toString() {
-			return "#";
-		}
-	}
-
-	/**
-	 * Node representing zero or more repetitions of its child.
-	 */
-	private static class StarNode extends AbstractNode {
-		private Node child;
-
-		public StarNode(Node child) {
-			this.child = child;
-			this.firstPos = child.getFirstPos();
-			this.lastPos = child.getLastPos();
-			this.nullable = true;
-		}
-
-		public void accept(NodeVisitor visitor) {
-			child.accept(visitor);
-			visitor.visitStarNode(this);
-		}
-
-		public Object clone() {
-			return new StarNode((Node) this.child.clone());
-		}
-
-		public Node getChild() {
-			return this.child;
-		}
-	}
-
-	/**
-	 * Node representing a symbol.
-	 */
-	private static class SymbolNode extends AbstractNode {
-
-		private static int pos = 1;
-		private int myPos;
-		private Object symbol;
-
-		public SymbolNode(Object symbol) {
-			this.symbol = symbol;
-			this.firstPos = Collections.singleton(this);
-			this.lastPos = Collections.singleton(this);
-			this.nullable = false;
-			this.myPos = pos++;
-		}
-
-		public void accept(NodeVisitor visitor) {
-			visitor.visitSymbolNode(this);
-		}
-
-		public Object clone() {
-			return new SymbolNode(this.symbol);
-		}
-
-		public int getMyPos() {
-			return this.myPos;
-		}
-
-		public Object getSymbol() {
-			return this.symbol;
-		}
-	}
-
-	/*
-	 * private static String snSetToString(Set set) { StringBuffer sb = new
-	 * StringBuffer(); sb.append("{ "); Iterator i2 = set.iterator(); while
-	 * (i2.hasNext()) { SymbolNode sn2 = (SymbolNode) i2.next();
-	 * sb.append(sn2.getMyPos()); sb.append(" "); } sb.append("}"); return
-	 * sb.toString();
-	 * 
-	 * }
-	 */
-}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DFAState.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DFAState.java
deleted file mode 100644
index 62727c0..0000000
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DFAState.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     John Krasnay - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.validator;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Represents a state in a deterministic finite automaton (DFA). A DFA can be
- * thought of as a directed graph, where each arc in the graph represents a
- * transition on an input symbol to a new state (i.e. a node in the graph.) The
- * DFA has a start state and one or more accepting states. The DFA represents a
- * grammar. If a sequence of input symbols drives the DFA from the start state
- * to one of the accepting states, the sequence is a valid sentence in the
- * grammar represented by the DFA.
- * 
- * <p>
- * Within VEX, we use a DFA to validate the sequence of children of a given
- * element. A DFA is constructed for each element declaration in the DTD.
- * </p>
- * @deprecated Use the WTP Content Model see WTPVEXValidator.
- */
-public class DFAState implements Serializable {
-
-	private boolean accepting = false;
-	private Map transitions = new HashMap();
-
-	/**
-	 * Class constructor.
-	 */
-	public DFAState() {
-	}
-
-	/**
-	 * Return the state obtained by traversing the given list of symbols.
-	 * Returns null if the given sequence does not lead to a state in the DFA.
-	 * 
-	 * @param sequence
-	 *            Sequence of symbols to use.
-	 */
-	public DFAState getState(List sequence) {
-		DFAState state = this;
-		Iterator iter = sequence.iterator();
-		while (iter.hasNext()) {
-			state = state.getNextState(iter.next());
-			if (state == null) {
-				break;
-			}
-		}
-		return state;
-	}
-
-	/**
-	 * Adds an outgoing transition to the state.
-	 * 
-	 * @param symbol
-	 *            Symbol that initiates the transition.
-	 * @param target
-	 *            State to which the transition leads.
-	 */
-	public void addTransition(Object symbol, DFAState target) {
-		this.transitions.put(symbol, target);
-	}
-
-	/**
-	 * Returns the set of symbols that are valid for this state.
-	 */
-	public Set getValidSymbols() {
-		return this.transitions.keySet();
-	}
-
-	/**
-	 * Returns true if this is an accepting state of the DFA.
-	 */
-	public boolean isAccepting() {
-		return this.accepting;
-	}
-
-	/**
-	 * Returns the next state given the given input symbol, or null if there are
-	 * no outgoing transitions corresponding to the given symbol.
-	 * 
-	 * @param symbol
-	 *            input symbol
-	 */
-	public DFAState getNextState(Object symbol) {
-		return (DFAState) this.transitions.get(symbol);
-	}
-
-	/**
-	 * Sets the value of the accepting property.
-	 * 
-	 * @param accepting
-	 *            true if this an accepting state of the DFA.
-	 */
-	public void setAccepting(boolean accepting) {
-		this.accepting = accepting;
-	}
-
-	// ========================================================= PRIVATE
-
-}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java
deleted file mode 100644
index cb26f0e..0000000
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.core/src/org/eclipse/wst/xml/vex/core/internal/validator/DTDValidator.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     John Krasnay - initial API and implementation
- *     David Carver (STAR) - Migrated to WTP Content Model
- *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.validator;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.Validator;
-import org.eclipse.wst.xml.vex.core.internal.validator.AttributeDefinition.Type;
-import org.eclipse.wst.xml.vex.core.internal.validator.DFABuilder.Node;
-
-/**
- * A validator driven by a DTD.
- * @deprecated
- */
-public class DTDValidator extends AbstractValidator {
-
-	// DFA representing an EMPTY element; just a single non-accepting state
-	// with no transitions.
-	private static final DFAState emptyDFA = new DFAState();
-
-	// map element names to DFAs
-	private Map elementDFAs = new HashMap();
-
-	// list of all element names plus PCDATA
-	private Set anySet;
-
-	// map element names to arrays of AttributeDefinition objects
-	private Map attributeArrays = new HashMap();
-
-	// map element names to maps of attribute name to attribute def
-	private Map attributeMaps = new HashMap();
-
-	/**
-	 * Creates a instance of DtdValidator given a URL.
-	 * 
-	 * @param url
-	 *            URL of the DTD file to use.
-	 * @deprecated
-	 */
-	@SuppressWarnings( { "restriction", "unchecked" })
-	public static DTDValidator create(URL url) throws IOException {
-
-		// Compute the DFAs for each element in the DTD
-
-		ContentModelManager contentModelManager = ContentModelManager
-				.getInstance();
-		String resolved = url.toString();
-		CMDocument contentModel = contentModelManager.createCMDocument(
-				resolved, null);
-
-		DTDValidator validator = new DTDValidator();
-		Iterator iter = contentModel.getElements().iterator();
-		while (iter.hasNext()) {
-			CMElementDeclaration element = (CMElementDeclaration) iter.next();
-			String elementName = element.getNodeName();
-			int elementContentType = element.getContentType();
-			DFAState dfa;
-			if (element.getContentType() == CMElementDeclaration.EMPTY) {
-				dfa = emptyDFA;
-			} else if (element.getContentType() == CMElementDeclaration.ANY) {
-				dfa = null;
-			} else {
-				DFABuilder.Node node = createDFANode(element);
-				dfa = DFABuilder.createDFA(node);
-			}
-			validator.elementDFAs.put(element.getElementName(), dfa);
-
-			Map defMap = new HashMap();
-			AttributeDefinition[] defArray = new AttributeDefinition[element
-					.getAttributes().getLength()];
-			int i = 0;
-
-			Iterator iter2 = element.getAttributes().iterator();
-			while (iter2.hasNext()) {
-				CMAttributeDeclaration attr = (CMAttributeDeclaration) iter2
-						.next();
-				AttributeDefinition.Type type;
-				String[] values = null;
-				if (attr.getAttrType().equals(CMDataType.ENUM)) {
-					type = AttributeDefinition.Type.ENUMERATION;
-					values = attr.getAttrType().getEnumeratedValues();
-				} else if (attr.getAttrType().equals(CMDataType.NOTATION)) {
-					type = AttributeDefinition.Type.ENUMERATION;
-					values = attr.getAttrType().getEnumeratedValues();
-				} else
-					type = AttributeDefinition.Type.get(attr.getAttrType()
-							.getDataTypeName());
-
-				AttributeDefinition ad = new AttributeDefinition(attr
-						.getAttrName(), type, attr.getDefaultValue(), values,
-						attr.getUsage() == CMAttributeDeclaration.REQUIRED,
-						attr.getUsage() == CMAttributeDeclaration.FIXED);
-
-				defMap.put(attr.getAttrName(), ad);
-				defArray[i] = ad;
-
-				i++;
-			}
-			validator.attributeMaps.put(element.getElementName(), defMap);
-			Arrays.sort(defArray);
-			validator.attributeArrays.put(element.getElementName(), defArray);
-		}
-
-		// Calculate anySet
-
-		validator.anySet = new HashSet();
-		validator.anySet.addAll(validator.elementDFAs.keySet());
-		validator.anySet.add(Validator.PCDATA);
-
-		return validator;
-	}
-
-	public AttributeDefinition getAttributeDefinition(String element,
-			String attribute) {
-		Map attrMap = (Map) this.attributeMaps.get(element);
-		return attrMap == null ? null : (AttributeDefinition) attrMap
-				.get(attribute);
-	}
-
-	public List<AttributeDefinition> getAttributeDefinitions(String element) {
-		if (this.attributeArrays.containsKey(element)) {
-			return Arrays.asList((AttributeDefinition[]) this.attributeArrays.get(element));
-		} else {
-			return Arrays.asList(new AttributeDefinition[0]);
-		}
-	}
-
-	public Set getValidRootElements() {
-		return this.elementDFAs.keySet();
-	}
-
-	/** @see Validator#getValidItems */
-	/**
-	 * @deprecated
-	 */
-	public Set<String> getValidItems(String element) {
-
-		// First, get a set of candidates. We'll later test to see if each is
-		// valid to insert here.
-
-		Set candidates = null;
-//		DFAState dfa = (DFAState) elementDFAs.get(element);
-//		if (dfa == null) {
-//			// Anything goes!
-//			return this.anySet;
-//		}
-//
-//		DFAState target = dfa.getState(Arrays.asList(prefix));
-//		if (target == null) {
-//			return Collections.EMPTY_SET;
-//		} else {
-//			// If the last transition was due to PCDATA, adding more PCDATA
-//			// is also valid
-//			if (prefix.length > 0
-//					&& prefix[prefix.length - 1].equals(Validator.PCDATA)) {
-//				candidates = new HashSet();
-//				candidates.addAll(target.getValidSymbols());
-//				candidates.add(Validator.PCDATA);
-//			} else {
-//				candidates = target.getValidSymbols();
-//			}
-//		}
-//
-//		// Now, see if each candidate can be inserted at the given
-//		// offset. This second test is necessary in some simple
-//		// cases. Consider a <section> with an optional <title>; if
-//		// we're at the first offset of the <section> and a <title>
-//		// already exists, we should not allow another <title>.
-//		
-//		if (candidates.isEmpty()) {
-//			return Collections.EMPTY_SET;
-//		}
-//
-//		Set results = new HashSet();
-//		String[] middle = new String[1];
-//		for (Iterator iter = candidates.iterator(); iter.hasNext();) {
-//			middle[0] = (String) iter.next();
-//			if (this.isValidSequence(element, prefix, middle, suffix, true)) {
-//				results.add(middle[0]);
-//			}
-//		}
-		
-
-		return candidates;
-	}
-
-	/**
-	 * @see Validator#isValidSequence
-	 */
-	public boolean isValidSequence(String element, List<String> nodes,
-			boolean partial) {
-
-		DFAState dfa = (DFAState) this.elementDFAs.get(element);
-		if (dfa == null) {
-			// Unrecognized element. Give the user the benefit of the doubt.
-			return true;
-		}
-
-		DFAState target = dfa.getState(Arrays.asList(nodes));
-		
-		boolean returnValue;
-		if (target != null) {
-			returnValue = (partial || target.isAccepting());
-		} else {
-			returnValue = partial;
-		}
-			
-		
-		return returnValue;
-	}
-
-	// ==================================================== PRIVATE
-
-	/**
-	 * Homeys must call create()
-	 */
-	private DTDValidator() {
-	}
-
-	/**
-	 * Create a DFABuilder.Node corresponding to the given DTDItem.
-	 */
-	@SuppressWarnings("restriction")
-	private static DFABuilder.Node createDFANode(CMContent content) {
-		DFABuilder.Node node = null;
-
-		if (content == null) {
-			return DFABuilder.createSymbolNode(Validator.PCDATA);
-		}
-		
-		if (content instanceof CMElementDeclaration) {
-			CMElementDeclaration element = (CMElementDeclaration) content;
-			String elementName = element.getNodeName();
-			if (element.getContentType() == CMElementDeclaration.PCDATA) {
-				node = DFABuilder.createSymbolNode(Validator.PCDATA);
-			} else if (element.getContentType() == CMElementDeclaration.MIXED) {
-				CMContent child = element.getContent();
-				DFABuilder.Node newNode = createDFANode(child);
-				if (node == null) {
-					node = newNode;
-				} else {
-					node = DFABuilder.createChoiceNode(node, newNode);
-				}
-				DFABuilder.Node pcdata = DFABuilder
-						.createSymbolNode(Validator.PCDATA);
-				node = DFABuilder.createChoiceNode(node, pcdata);
-
-			} else if (element.getContent() != null) {
-				CMContent child = element.getContent();
-				node = createDFANode(child);
-			} else {
-				String name = content.getNodeName();
-				node = DFABuilder.createSymbolNode(name);
-			}
-		} else if (content instanceof CMGroup) {
-			CMGroup group = (CMGroup) content;
-			if (group.getOperator() == CMGroup.CHOICE) {
-				CMNodeList childNodes = group.getChildNodes();
-				for (int cnt = 0; cnt < childNodes.getLength(); cnt++) {
-					CMContent child = (CMContent) childNodes.item(cnt);
-					DFABuilder.Node newNode = createDFANode(child);
-					if (node == null) {
-						node = newNode;
-					} else {
-						node = DFABuilder.createChoiceNode(node, newNode);
-					}
-				}
-			} else if (group.getOperator() == CMGroup.SEQUENCE) {
-				CMNodeList childNodes = group.getChildNodes();
-				for (int cnt = 0; cnt < childNodes.getLength(); cnt++) {
-					CMContent child = (CMContent) childNodes.item(cnt);
-					DFABuilder.Node newNode = createDFANode(child);
-					if (node == null) {
-						node = newNode;
-					} else {
-						node = DFABuilder.createSequenceNode(node, newNode);
-					}
-				}
-			}
-		} else {
-			String name = content.getNodeName();
-			node = DFABuilder.createSymbolNode(name);
-		}
-
-		// Cardinality is moot if it's a null node
-		if (node == null) {
-			return node;
-		}
-
-		if (content.getMinOccur() == 0 && content.getMaxOccur() == -1) {
-			node = DFABuilder.createRepeatingNode(node, 0);
-		} else if (content.getMinOccur() > 0 && content.getMaxOccur() == -1) {
-			node = DFABuilder.createRepeatingNode(node, 1);
-		} else if (content.getMinOccur() == 0) {
-			node = DFABuilder.createOptionalNode(node);
-		}
-
-		return node;
-	}
-
-}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
index e654960..ee00be9 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.docbook/src/org/eclipse/wst/xml/vex/docbook/DocBookOutlineProvider.java
@@ -14,16 +14,14 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.eclipse.wst.xml.vex.core.internal.dom.*;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
-
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 import org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor;
 import org.eclipse.wst.xml.vex.ui.internal.outline.IOutlineProvider;
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
index 524a539..5dc679b 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/DoctypeFactory.java
@@ -13,7 +13,6 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.eclipse.wst.xml.vex.core.internal.validator.DTDValidator;
 import org.eclipse.wst.xml.vex.core.internal.validator.WTPVEXValidator;
 
 
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VEXMultiPageEditorPart.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VEXMultiPageEditorPart.java
index 06efd4a..83b3fbb 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VEXMultiPageEditorPart.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VEXMultiPageEditorPart.java
@@ -11,7 +11,6 @@
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.ui.internal.Logger;
 import org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorMessages;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLTableTreeViewer;
 import org.eclipse.wst.xml.vex.ui.internal.swt.VexWidget;
 
 public class VEXMultiPageEditorPart extends MultiPageEditorPart {
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
index fb4defc..4a00dd3 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/VexEditor.java
@@ -69,8 +69,6 @@
 import org.eclipse.ui.views.properties.PropertySheetPage;
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -114,8 +112,6 @@
 	 */
 	public static final String ID = "org.eclipse.wst.xml.vex.ui.internal.editor.VexEditor"; //$NON-NLS-1$
 	
-	private ModelQuery modelQuery = null;
-
 	/**
 	 * Class constructor.
 	 */
@@ -351,13 +347,8 @@
 			}
 
 		    IDOMDocument modelDocument = getDOMDocument(file);
-  	        modelQuery = ModelQueryUtil.getModelQuery(modelDocument);
   	        IDOMElement documentElement = (IDOMElement)modelDocument.getDocumentElement();
   	        
-
-			
-//			URL url = inputPath.toFile().toURL();
-
 			DOMDocumentReader reader = new DOMDocumentReader();
 			reader.setDebugging(this.debugging);
 			reader.setEntityResolver(entityResolver);
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
index 486bf51..b5e0ab4 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/wizards/NewDocumentWizard.java
@@ -33,7 +33,6 @@
 import org.eclipse.wst.xml.vex.core.internal.dom.Document;
 import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
 import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
 import org.eclipse.wst.xml.vex.ui.internal.VexPlugin;
 import org.eclipse.wst.xml.vex.ui.internal.config.Style;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DFABuilderTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DFABuilderTest.java
deleted file mode 100644
index ca5f8f5..0000000
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DFABuilderTest.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 John Krasnay 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     John Krasnay - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.vex.core.internal.dom;
-
-import org.eclipse.wst.xml.vex.core.internal.dom.*;
-import org.eclipse.wst.xml.vex.core.internal.validator.DFABuilder;
-import org.eclipse.wst.xml.vex.core.internal.validator.DFAState;
-
-import junit.framework.*;
-
-/**
- * Test the <code>org.eclipse.wst.xml.vex.core.internal.dom</code> package.
- */
-public class DFABuilderTest extends TestCase {
-
-	public void testAll() {
-		DFAState dfa;
-
-		dfa = parseRegex("a");
-		assertTrue(matches(dfa, "a"));
-		assertFalse(matches(dfa, ""));
-		assertFalse(matches(dfa, "aa"));
-
-		dfa = parseRegex("a?");
-		assertTrue(matches(dfa, ""));
-		assertTrue(matches(dfa, "a"));
-		assertFalse(matches(dfa, "aa"));
-
-		dfa = parseRegex("a*");
-		assertTrue(matches(dfa, ""));
-		assertTrue(matches(dfa, "a"));
-		assertTrue(matches(dfa, "aa"));
-		assertTrue(matches(dfa, "aaa"));
-
-		dfa = parseRegex("a+");
-		assertFalse(matches(dfa, ""));
-		assertTrue(matches(dfa, "a"));
-		assertTrue(matches(dfa, "aa"));
-		assertTrue(matches(dfa, "aaa"));
-
-		dfa = parseRegex("ab");
-		assertFalse(matches(dfa, ""));
-		assertFalse(matches(dfa, "a"));
-		assertFalse(matches(dfa, "b"));
-		assertTrue(matches(dfa, "ab"));
-		assertFalse(matches(dfa, "aab"));
-		assertFalse(matches(dfa, "abb"));
-
-		dfa = parseRegex("a|b");
-		assertFalse(matches(dfa, ""));
-		assertTrue(matches(dfa, "a"));
-		assertTrue(matches(dfa, "b"));
-		assertFalse(matches(dfa, "ab"));
-		assertFalse(matches(dfa, "ba"));
-
-		dfa = parseRegex("a?b");
-		assertFalse(matches(dfa, ""));
-		assertFalse(matches(dfa, "a"));
-		assertTrue(matches(dfa, "b"));
-		assertTrue(matches(dfa, "ab"));
-		assertFalse(matches(dfa, "aa"));
-		assertFalse(matches(dfa, "bb"));
-		assertFalse(matches(dfa, "aab"));
-
-		dfa = parseRegex("a*b");
-		assertFalse(matches(dfa, ""));
-		assertFalse(matches(dfa, "a"));
-		assertTrue(matches(dfa, "b"));
-		assertTrue(matches(dfa, "ab"));
-		assertFalse(matches(dfa, "aa"));
-		assertFalse(matches(dfa, "bb"));
-		assertTrue(matches(dfa, "aab"));
-		assertTrue(matches(dfa, "aaab"));
-		assertFalse(matches(dfa, "aabb"));
-
-		dfa = parseRegex("a+b");
-		assertFalse(matches(dfa, ""));
-		assertFalse(matches(dfa, "a"));
-		assertFalse(matches(dfa, "b"));
-		assertTrue(matches(dfa, "ab"));
-		assertFalse(matches(dfa, "aa"));
-		assertFalse(matches(dfa, "bb"));
-		assertTrue(matches(dfa, "aab"));
-		assertTrue(matches(dfa, "aaab"));
-		assertFalse(matches(dfa, "aabb"));
-
-		dfa = parseRegex("(ts?)?p*");
-		assertTrue(matches(dfa, ""));
-		assertTrue(matches(dfa, "t"));
-		assertTrue(matches(dfa, "ts"));
-		assertTrue(matches(dfa, "tsppp"));
-		assertTrue(matches(dfa, "ppp"));
-		assertFalse(matches(dfa, "s"));
-		assertFalse(matches(dfa, "sp"));
-	}
-
-	/**
-	 * Returns true if the given DFA matches the given string.
-	 */
-	private boolean matches(DFAState state, String s) {
-		for (int i = 0; i < s.length(); i++) {
-			String symbol = String.valueOf(s.charAt(i));
-			state = state.getNextState(symbol);
-			if (state == null) {
-				return false;
-			}
-		}
-		return state.isAccepting();
-	}
-
-	/**
-	 * Parses simple regex's into nodes.
-	 */
-	private DFAState parseRegex(String s) {
-		ParseState ps = new ParseState();
-		ps.s = s;
-		ps.pos = 0;
-		return DFABuilder.createDFA(parseRegex(ps));
-	}
-
-	private static class ParseState {
-		public String s;
-		public int pos;
-
-		public char getChar() {
-			if (pos == s.length()) {
-				return 0;
-			} else {
-				return s.charAt(pos++);
-			}
-		}
-
-		public char peekChar() {
-			if (pos == s.length()) {
-				return 0;
-			} else {
-				return s.charAt(pos);
-			}
-		}
-	}
-
-	//
-	// regex ::= null
-	// | part regex*
-	// | ')'
-	//
-	// part ::= repeating [ '|' part ]
-	//
-	// repeating ::= simplepart [ '?' | '*' | '+' ]
-	//
-	// simplepart ::= char
-	// | '(' regex
-	//
-	private DFABuilder.Node parseRegex(ParseState ps) {
-
-		if (ps.peekChar() == ')') {
-			ps.getChar();
-			return null;
-		}
-
-		DFABuilder.Node node = parsePart(ps);
-		if (node == null) {
-			return node;
-		}
-
-		DFABuilder.Node node2 = parseRegex(ps);
-		if (node2 != null) {
-			node = DFABuilder.createSequenceNode(node, node2);
-		}
-
-		return node;
-	}
-
-	private DFABuilder.Node parsePart(ParseState ps) {
-		DFABuilder.Node node = parseRepeating(ps);
-		if (node == null) {
-			return node;
-		}
-
-		if (ps.peekChar() == '|') {
-			ps.getChar();
-			DFABuilder.Node node2 = parsePart(ps);
-			if (node2 != null) {
-				node = DFABuilder.createChoiceNode(node, node2);
-			}
-		}
-
-		return node;
-	}
-
-	private DFABuilder.Node parseRepeating(ParseState ps) {
-
-		DFABuilder.Node node = parseSimplePart(ps);
-		if (node == null) {
-			return node;
-		}
-
-		if (ps.peekChar() == '?') {
-			ps.getChar();
-			node = DFABuilder.createOptionalNode(node);
-		} else if (ps.peekChar() == '*') {
-			ps.getChar();
-			node = DFABuilder.createRepeatingNode(node, 0);
-		} else if (ps.peekChar() == '+') {
-			ps.getChar();
-			node = DFABuilder.createRepeatingNode(node, 1);
-		}
-
-		return node;
-	}
-
-	private DFABuilder.Node parseSimplePart(ParseState ps) {
-
-		DFABuilder.Node node;
-
-		char c = ps.getChar();
-
-		if (c == 0) {
-			return null;
-		} else if (c == '(') {
-			node = parseRegex(ps);
-		} else {
-			node = DFABuilder.createSymbolNode(String.valueOf(c));
-		}
-
-		return node;
-	}
-
-	/*
-	 * private DFABuilder.Node parseRegexToNode(ParseState ps) { DFABuilder.Node
-	 * node = null; while (ps.pos < ps.s.length()) { DFABuilder.Node nextNode;
-	 * char c = ps.s.charAt(ps.pos); ps.pos++; if (c == ')') { return node; }
-	 * else if (c == '(') { nextNode = parseRegexToNode(ps); } else if (c == '?'
-	 * || c == '*' || c == '+') { throw new RuntimeException("Misplaced '?': " +
-	 * ps.s); } else { nextNode =
-	 * DFABuilder.createSymbolNode(String.valueOf(c)); }
-	 * 
-	 * if (ps.pos < ps.s.length()) { char c2 = ps.s.charAt(ps.pos); if (c2 ==
-	 * '?') { nextNode = DFABuilder.createOptionalNode(nextNode); ps.pos++; }
-	 * else if (c2 == '*') { nextNode = DFABuilder.createRepeatingNode(nextNode,
-	 * 0); ps.pos++; } else if (c2 == '+') { nextNode =
-	 * DFABuilder.createRepeatingNode(nextNode, 1); ps.pos++; } }
-	 * 
-	 * if (node == null) { node = nextNode; } else { node =
-	 * DFABuilder.createSequenceNode(node, nextNode); } }
-	 * 
-	 * return node; }
-	 */
-}
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMSynchronizationTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMSynchronizationTest.java
index a7c272b..aefea72 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMSynchronizationTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DOMSynchronizationTest.java
@@ -4,25 +4,21 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 
+import junit.framework.TestCase;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXNode;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
 import org.eclipse.wst.xml.vex.core.tests.VEXCoreTestPlugin;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.w3c.dom.Attr;
 
-import junit.framework.TestCase;
-
 public class DOMSynchronizationTest extends TestCase {
 	private IStructuredDocument loadTestFile()
 			throws UnsupportedEncodingException, IOException {
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
index 98c69ce..aa6835c 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DocumentWriterTest.java
@@ -16,25 +16,23 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
+
 import junit.framework.TestCase;
 
 import org.eclipse.wst.xml.vex.core.internal.core.DisplayDevice;
 import org.eclipse.wst.xml.vex.core.internal.css.MockDisplayDevice;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
-import org.eclipse.wst.xml.vex.core.internal.dom.DocumentWriter;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXNode;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicyFactory;
 import org.eclipse.wst.xml.vex.core.internal.widget.CssWhitespacePolicy;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
index 00c98f2..00f84e0 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/DomTest.java
@@ -12,26 +12,21 @@
 
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
 import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.vex.core.internal.dom.Document;
-import org.eclipse.wst.xml.vex.core.internal.dom.Element;
-import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.dom.Text;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocumentFragment;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXNode;
 
-import junit.framework.TestCase;
-
 /**
  * Test the <code>org.eclipse.wst.vex.core.internal.dom</code> package.
  */
@@ -41,7 +36,7 @@
 		IDOMModel model = initDOM();
 		IDOMDocument domDocument = model.getDocument();
 		
-		this.assertNotNull("Structured Document NULL.", domDocument.getStructuredDocument());
+		assertNotNull("Structured Document NULL.", domDocument.getStructuredDocument());
 	}
 
 	private IDOMModel initDOM() {
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
index b80bedb..f481c3c 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/dom/TextWrapperTest.java
@@ -17,7 +17,6 @@
 /**
  * Test the TextWrapper class.
  */
-@SuppressWarnings("restriction")
 public class TextWrapperTest extends TestCase {
 
 	public void testWrap() {
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
index a6cc09c..84e64e7 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestBlockElementBox.java
@@ -12,20 +12,15 @@
 
 import java.net.URL;
 
+import junit.framework.TestCase;
+
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheetReader;
 import org.eclipse.wst.xml.vex.core.internal.dom.Document;
 import org.eclipse.wst.xml.vex.core.internal.dom.Element;
 import org.eclipse.wst.xml.vex.core.internal.dom.RootElement;
-import org.eclipse.wst.xml.vex.core.internal.layout.BlockElementBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.BlockPseudoElementBox;
-import org.eclipse.wst.xml.vex.core.internal.layout.Box;
-import org.eclipse.wst.xml.vex.core.internal.layout.LayoutContext;
-import org.eclipse.wst.xml.vex.core.internal.layout.RootBox;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXDocument;
 
-import junit.framework.TestCase;
-
 @SuppressWarnings("restriction")
 public class TestBlockElementBox extends TestCase {
 
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
index 9fec13d..5fdab14 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/internal/layout/TestStaticTextBox.java
@@ -25,7 +25,6 @@
 
 import junit.framework.TestCase;
 
-@SuppressWarnings("restriction")
 public class TestStaticTextBox extends TestCase {
 
 	FakeGraphics g;
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
index 5f798dd..6ed6a17 100755
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src/org/eclipse/wst/xml/vex/core/tests/VEXCoreTestSuite.java
@@ -29,7 +29,6 @@
 		addTestSuite(RuleTest.class);
 		addTestSuite(SerializationTest.class);
 		addTestSuite(BlockElementBoxTest.class);
-		addTestSuite(DFABuilderTest.class);
 		addTestSuite(DocumentWriterTest.class);
 		addTestSuite(DomTest.class);
 		addTestSuite(DTDValidatorTest.class);
diff --git a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockCssWhitespacePolicy.java b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockCssWhitespacePolicy.java
index 6aa3d8b..18b7d24 100644
--- a/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockCssWhitespacePolicy.java
+++ b/sourceediting/tests/org.eclipse.wst.xml.vex.core.tests/src_emf/org/eclipse/wst/xml/vex/core/internal/provisional/dom/tests/MockCssWhitespacePolicy.java
@@ -10,10 +10,9 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.vex.core.internal.provisional.dom.tests;
 
-import org.eclipse.wst.xml.vex.core.internal.css.CSS;
 import org.eclipse.wst.xml.vex.core.internal.css.StyleSheet;
-import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 import org.eclipse.wst.xml.vex.core.internal.provisional.dom.IWhitespacePolicy;
+import org.eclipse.wst.xml.vex.core.internal.provisional.dom.I.VEXElement;
 
 /**
  * Implementation of WhitespacePolicy using a CSS stylesheet.