diff --git a/org.eclipse.wb.rcp/wbp-meta/.wbp-cache-presentations b/org.eclipse.wb.rcp/wbp-meta/.wbp-cache-presentations
index 987cc4d6b..43d8bdfdf 100644
--- a/org.eclipse.wb.rcp/wbp-meta/.wbp-cache-presentations
+++ b/org.eclipse.wb.rcp/wbp-meta/.wbp-cache-presentations
@@ -1 +1 @@
-c696a118dadb424fbe3b5b287eb42106
\ No newline at end of file
+67cf5399c1989e1a8f86cc5bb557276a
\ No newline at end of file
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/swt/browser/Browser.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/swt/browser/Browser.wbp-component.xml
deleted file mode 100644
index b4aea6ec3..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/swt/browser/Browser.wbp-component.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<description>A Browser implement the browser user interface metaphor. It allows the user to visualize and
-		navigate through HTML documents (Eclipse 3.0 and above only).</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.swt.browser.Browser(%parent%, org.eclipse.swt.SWT.NONE)]]></source>
-	</creation>
-	<!-- CONSTRUCTORS -->
-	<constructors>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-			<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-				<editor id="style">
-					<parameter name="class">org.eclipse.swt.SWT</parameter>
-					<parameter name="set">BORDER MOZILLA</parameter>
-				</editor>
-			</parameter>
-		</constructor>
-	</constructors>
-	<!-- PROPERTIES -->
-	<properties-preferred names="url"/>
-	<!-- PARAMETERS -->
-	<parameters>
-		<parameter name="layout.has">false</parameter>
-	</parameters>
-</component>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/swt/widgets/Text.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/swt/widgets/Text.wbp-component.xml
deleted file mode 100644
index 425501559..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/swt/widgets/Text.wbp-component.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<description>Instances of this class are selectable user interface objects that allow the user to enter
-		and modify text.</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.swt.widgets.Text(%parent%, org.eclipse.swt.SWT.BORDER)]]></source>
-		<x-attribute ns="http://www.eclipse.org/xwt" name="Style" value="BORDER"/>
-	</creation>
-	<!-- CONSTRUCTORS -->
-	<constructors>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-			<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-				<editor id="style">
-					<parameter name="class">org.eclipse.swt.SWT</parameter>
-					<parameter name="set">BORDER READ_ONLY WRAP H_SCROLL V_SCROLL PASSWORD SEARCH CANCEL</parameter>
-					<parameter name="select0">align LEFT LEFT CENTER RIGHT</parameter>
-					<parameter name="select1">lines SINGLE SINGLE MULTI</parameter>
-				</editor>
-			</parameter>
-		</constructor>
-	</constructors>
-	<!-- METHODS -->
-	<methods>
-		<method name="setSelection">
-			<parameter type="int"/>
-			<parameter type="int"/>
-		</method>
-		<method name="showSelection"/>
-		<method name="selectAll"/>
-		<method name="append">
-			<parameter type="java.lang.String"/>
-		</method>
-		<method name="insert">
-			<parameter type="java.lang.String"/>
-		</method>
-	</methods>
-	<!-- PROPERTIES -->
-	<properties-preferred names="text"/>
-	<properties-advanced
-		names="doubleClickEnabled echoChar message tabs textLimit selection topIndex"/>
-	<property-tag name="text" tag="isText" value="true"/>
-	<!-- MORPHING -->
-	<morphTargets>
-		<morphTarget class="org.eclipse.swt.widgets.Button"/>
-		<morphTarget class="org.eclipse.swt.widgets.Label"/>
-		<morphTarget class="org.eclipse.swt.widgets.Combo"/>
-		<morphTarget class="org.eclipse.swt.widgets.DateTime"/>
-		<morphTarget class="org.eclipse.swt.widgets.Spinner"/>
-	</morphTargets>
-	<!-- PARAMETERS -->
-	<parameters>
-		<parameter name="gridLayout.grabHorizontal">true</parameter>
-		<parameter name="gridLayout.rightAlignment.isTarget">true</parameter>
-		<!-- untyped events -->
-		<parameter name="RCP.untyped.events: org.eclipse.swt.widgets.Text"><![CDATA[
-			DefaultSelection Modify Verify OrientationChange Selection 
-		]]></parameter>
-	</parameters>
-</component>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/Form.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/Form.wbp-component.xml
deleted file mode 100644
index cfcc482c2..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/Form.wbp-component.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<model class="org.eclipse.wb.internal.rcp.model.forms.FormInfo"/>
-	<x-model class="org.eclipse.wb.internal.xwt.model.forms.FormInfo"/>
-	<description>Form is a custom control that renders a title and an optional background image above the body
-		composite. It can be used alone when part of parents that are scrolled. If scrolling is required, use
-		ScrolledForm instead because it has an instance of Form and adds scrolling capability.</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.ui.forms.widgets.Form(%parent%, org.eclipse.swt.SWT.BORDER)]]></source>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New Form"]]></invocation>
-		<x-attribute name="text" value="New Form"/>
-	</creation>
-	<!-- CONSTRUCTORS -->
-	<constructors>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-			<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-				<editor id="style">
-					<parameter name="class">org.eclipse.swt.SWT</parameter>
-					<parameter name="set">BORDER</parameter>
-				</editor>
-			</parameter>
-		</constructor>
-	</constructors>
-	<!-- EXPOSING RULES -->
-	<exposing-rules>
-		<include method="getHead"/>
-		<include method="getBody"/>
-	</exposing-rules>
-	<!-- PROPERTIES -->
-	<properties-preferred names="text image"/>
-	<properties-advanced
-		names="backgroundImageAlignment backgroundImageClipped backgroundImageTiled separatorColor"/>
-	<property-tag name="text" tag="isText" value="true"/>
-	<property id="setBackgroundImageAlignment(int)">
-		<editor id="staticField">
-			<parameter name="class">org.eclipse.swt.SWT</parameter>
-			<parameter name="fields">LEFT</parameter>
-		</editor>
-	</property>
-	<property id="setToolBarVerticalAlignment(int)">
-		<editor id="staticField">
-			<parameter name="class">org.eclipse.swt.SWT</parameter>
-			<parameter name="fields">TOP BOTTOM</parameter>
-		</editor>
-	</property>
-	<!-- PARAMETERS -->
-	<parameters>
-		<parameter name="layout.has">false</parameter>
-		<parameter name="directEdit.location.insets">-5 15 0 0</parameter>
-		<parameter name="directEdit.location.horizontalAlignment">left</parameter>
-		<parameter name="directEdit.location.verticalAlignment">top</parameter>
-	</parameters>
-</component>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/FormToolkit.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/FormToolkit.wbp-component.xml
deleted file mode 100644
index 29960a5ba..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/FormToolkit.wbp-component.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<description>The toolkit is responsible for creating SWT controls adapted to work in Eclipse forms. In
-		addition to changing their presentation properties (fonts, colors etc.), various listeners are
-		attached to make them behave correctly in the form context.</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.ui.forms.widgets.FormToolkit(org.eclipse.swt.widgets.Display.getDefault())]]></source>
-	</creation>
-	<!-- METHODS -->
-	<methods>
-		<method name="decorateFormHeading">
-			<parameter type="org.eclipse.ui.forms.widgets.Form"/>
-		</method>
-		<method name="adapt">
-			<parameter type="org.eclipse.swt.widgets.Composite"/>
-		</method>
-		<method name="adapt">
-			<parameter type="org.eclipse.swt.widgets.Control"/>
-			<parameter type="boolean"/>
-			<parameter type="boolean"/>
-		</method>
-		<method name="paintBordersFor">
-			<parameter type="org.eclipse.swt.widgets.Composite"/>
-		</method>
-	</methods>
-	<!-- PROPERTIES -->
-	<property id="setBorderStyle(int)">
-		<editor id="staticField">
-			<parameter name="class">org.eclipse.swt.SWT</parameter>
-			<parameter name="fields">NULL BORDER</parameter>
-		</editor>
-	</property>
-	<property id="setOrientation(int)">
-		<editor id="staticField">
-			<parameter name="class">org.eclipse.swt.SWT</parameter>
-			<parameter name="fields">NULL LEFT_TO_RIGHT RIGHT_TO_LEFT</parameter>
-		</editor>
-	</property>
-</component>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/FormToolkit.wbp-factory.xml b/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/FormToolkit.wbp-factory.xml
deleted file mode 100644
index c23efdc7f..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/FormToolkit.wbp-factory.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<factory xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<!-- createButton() -->
-	<method name="createButton">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="java.lang.String" defaultSource="&quot;New Button&quot;"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER</parameter>
-				<parameter name="select0">type PUSH PUSH CHECK RADIO TOGGLE ARROW</parameter>
-				<parameter name="select1">align LEFT LEFT CENTER RIGHT</parameter>
-			</editor>
-		</parameter>
-		<description>Creates a button as a part of the form.</description>
-	</method>
-
-
-	<!-- createComposite() -->
-	<method name="createComposite">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<description>Creates the composite as a part of the form.</description>
-	</method>
-
-	<method name="createComposite">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER H_SCROLL V_SCROLL NO_BACKGROUND NO_FOCUS NO_MERGE_PAINTS
-					NO_REDRAW_RESIZE NO_RADIO_GROUP</parameter>
-			</editor>
-		</parameter>
-		<description>Creates the composite as a part of the form.</description>
-	</method>
-
-
-	<!-- createComposite() -->
-	<method name="createCompositeSeparator">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<description>Creats the composite that can serve as a separator between various parts of a form.
-			Separator height should be controlled by setting the height hint on the layout data for the
-			composite.</description>
-		<parameters>
-			<parameter name="layout.has">false</parameter>
-		</parameters>
-	</method>
-
-
-	<!-- createLabel() -->
-	<method name="createLabel">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="java.lang.String" defaultSource="&quot;New Label&quot;"/>
-		<description>Creates a label as a part of the form.</description>
-	</method>
-
-	<method name="createLabel">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="java.lang.String" defaultSource="&quot;New Label&quot;"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER SEPARATOR WRAP</parameter>
-				<parameter name="select0">dir VERTICAL HORIZONTAL VERTICAL</parameter>
-				<parameter name="select1">shadow SHADOW_OUT SHADOW_IN SHADOW_OUT SHADOW_NONE</parameter>
-				<parameter name="select2">align LEFT LEFT CENTER RIGHT</parameter>
-			</editor>
-		</parameter>
-		<description>Creates a label as a part of the form.</description>
-	</method>
-
-
-	<!-- createHyperlink() -->
-	<method name="createHyperlink">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="java.lang.String" defaultSource="&quot;New Hyperlink&quot;"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER WRAP NO_FOCUS</parameter>
-			</editor>
-		</parameter>
-		<description>Creates a hyperlink as a part of the form. The hyperlink will be added to the hyperlink
-			group that belongs to this toolkit.</description>
-	</method>
-
-
-	<!-- createImageHyperlink() -->
-	<method name="createImageHyperlink">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER WRAP NO_FOCUS</parameter>
-				<parameter name="select0">align_h LEFT LEFT RIGHT</parameter>
-				<parameter name="select1">align_v CENTER TOP CENTER BOTTOM</parameter>
-			</editor>
-		</parameter>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New ImageHyperlink"]]></invocation>
-		<description>Creates an image hyperlink as a part of the form. The hyperlink will be added to the
-			hyperlink group that belongs to this toolkit.</description>
-	</method>
-
-
-	<!-- createFormText() -->
-	<method name="createFormText">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="boolean"/>
-		<invocation signature="setText(java.lang.String,boolean,boolean)"
-			><![CDATA["New FormText", false, false]]></invocation>
-		<description>Creates a rich text as a part of the form.</description>
-	</method>
-
-
-	<!-- createSeparator() -->
-	<method name="createSeparator">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="select0">dir VERTICAL HORIZONTAL VERTICAL</parameter>
-				<parameter name="select1">shadow SHADOW_OUT SHADOW_IN SHADOW_OUT SHADOW_NONE</parameter>
-			</editor>
-		</parameter>
-		<description>Creates a separator label as a part of the form.</description>
-	</method>
-
-
-	<!-- createTable() -->
-	<method name="createTable">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER CHECK FULL_SELECTION HIDE_SELECTION VIRTUAL</parameter>
-				<parameter name="select0">selection SINGLE SINGLE MULTI</parameter>
-			</editor>
-		</parameter>
-		<invocation signature="setLinesVisible(boolean)"><![CDATA[true]]></invocation>
-		<invocation signature="setHeaderVisible(boolean)"><![CDATA[true]]></invocation>
-		<description>Creates a table as a part of the form.</description>
-	</method>
-
-
-	<!-- createText() -->
-	<method name="createText">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="java.lang.String" defaultSource="&quot;New Text&quot;"
-			property="property.setter: setText(java.lang.String)"/>
-		<description>Creates a text as a part of the form.</description>
-	</method>
-
-	<method name="createText">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="java.lang.String" defaultSource="&quot;New Text&quot;"
-			property="property.setter: setText(java.lang.String)"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER READ_ONLY WRAP H_SCROLL V_SCROLL PASSWORD SEARCH CANCEL</parameter>
-				<parameter name="select0">align LEFT LEFT CENTER RIGHT</parameter>
-				<parameter name="select1">lines SINGLE SINGLE MULTI</parameter>
-			</editor>
-		</parameter>
-		<description>Creates a text as a part of the form.</description>
-	</method>
-
-
-	<!-- createTree() -->
-	<method name="createTree">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-			<editor id="style">
-				<parameter name="class">org.eclipse.swt.SWT</parameter>
-				<parameter name="set">BORDER CHECK FULL_SELECTION VIRTUAL</parameter>
-				<parameter name="select0">selection SINGLE SINGLE MULTI</parameter>
-			</editor>
-		</parameter>
-		<description>Creates a tree widget as a part of the form.</description>
-	</method>
-
-
-	<!-- createExpandableComposite() -->
-	<method name="createExpandableComposite">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int" defaultSource="org.eclipse.ui.forms.widgets.ExpandableComposite.TWISTIE">
-			<editor id="style">
-				<parameter name="title">ExpansionStyle</parameter>
-				<parameter name="class">org.eclipse.ui.forms.widgets.ExpandableComposite</parameter>
-				<parameter name="select0">expander TWISTIE TWISTIE TREE_NODE</parameter>
-				<parameter name="select1">title NO_TITLE NO_TITLE SHORT_TITLE_BAR TITLE_BAR</parameter>
-				<parameter name="set">FOCUS_TITLE CLIENT_INDENT COMPACT EXPANDED
-				LEFT_TEXT_CLIENT_ALIGNMENT</parameter>
-			</editor>
-		</parameter>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New ExpandableComposite"]]></invocation>
-		<description>Creates an expandable composite as a part of the form.</description>
-	</method>
-
-
-	<!-- createSection() -->
-	<method name="createSection">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<parameter type="int"
-			defaultSource="org.eclipse.ui.forms.widgets.Section.TWISTIE | org.eclipse.ui.forms.widgets.Section.TITLE_BAR">
-			<editor id="style">
-				<parameter name="title">SectionStyle</parameter>
-				<parameter name="class">org.eclipse.ui.forms.widgets.Section</parameter>
-				<parameter name="select0">expander 0 0 TWISTIE TREE_NODE</parameter>
-				<parameter name="select1">title NO_TITLE NO_TITLE SHORT_TITLE_BAR TITLE_BAR</parameter>
-				<parameter name="set">FOCUS_TITLE CLIENT_INDENT COMPACT EXPANDED LEFT_TEXT_CLIENT_ALIGNMENT
-					DESCRIPTION</parameter>
-			</editor>
-		</parameter>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New Section"]]></invocation>
-		<description>Creates a section as a part of the form.</description>
-	</method>
-
-
-	<!-- createForm() -->
-	<method name="createForm">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New Form"]]></invocation>
-		<description>Creates a form widget in the provided parent. Note that this widget does not scroll its
-			content, so make sure there is a scrolled composite up the parent chain. If you require scrolling,
-			use 'createScrolledForm' instead.</description>
-	</method>
-
-
-	<!-- createScrolledForm() -->
-	<method name="createScrolledForm">
-		<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New ScrolledForm"]]></invocation>
-		<description>Creates a scrolled form widget in the provided parent. If you do not require scrolling
-			because there is already a scrolled composite up the parent chain, use 'createForm'
-		instead.</description>
-	</method>
-
-
-</factory>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/ScrolledForm.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/ScrolledForm.wbp-component.xml
deleted file mode 100644
index 53089d6ee..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.3/org/eclipse/ui/forms/widgets/ScrolledForm.wbp-component.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<model class="org.eclipse.wb.internal.rcp.model.forms.ScrolledFormInfo"/>
-	<x-model class="org.eclipse.wb.internal.xwt.model.forms.ScrolledFormInfo"/>
-	<description>ScrolledForm is a control that is capable of scrolling an instance of the Form class. It
-		should be created in a parent that will allow it to use all the available area (for example, a shell,
-		a view or an editor).</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.ui.forms.widgets.ScrolledForm(%parent%)]]></source>
-		<invocation signature="setExpandVertical(boolean)"><![CDATA[true]]></invocation>
-		<invocation signature="setExpandHorizontal(boolean)"><![CDATA[true]]></invocation>
-		<invocation signature="setText(java.lang.String)"><![CDATA["New ScrolledForm"]]></invocation>
-	</creation>
-	<!-- CONSTRUCTORS -->
-	<constructors>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-		</constructor>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-			<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-				<editor id="style">
-					<parameter name="class">org.eclipse.swt.SWT</parameter>
-					<parameter name="set">BORDER H_SCROLL V_SCROLL</parameter>
-				</editor>
-			</parameter>
-		</constructor>
-	</constructors>
-	<!-- EXPOSING RULES -->
-	<exposing-rules>
-		<include method="getBody"/>
-	</exposing-rules>
-	<!-- PROPERTIES -->
-	<properties-preferred names="text image"/>
-	<properties-advanced names="expandHorizontal expandVertical minWidth minHeight origin"/>
-	<property-tag name="text" tag="isText" value="true"/>
-	<property id="setBusy(boolean)">
-		<defaultValue value="false"/>
-	</property>
-	<!-- PARAMETERS -->
-	<parameters>
-		<parameter name="layout.has">false</parameter>
-		<parameter name="directEdit.location.insets">-5 15 0 0</parameter>
-		<parameter name="directEdit.location.horizontalAlignment">left</parameter>
-		<parameter name="directEdit.location.verticalAlignment">top</parameter>
-	</parameters>
-</component>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.4/org/eclipse/swt/widgets/DateTime.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.4/org/eclipse/swt/widgets/DateTime.wbp-component.xml
deleted file mode 100644
index de0fb127c..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.4/org/eclipse/swt/widgets/DateTime.wbp-component.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<description>Instances of this class are selectable user interface objects that allow the user to enter
-		and modify date or time values.</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.swt.widgets.DateTime(%parent%, org.eclipse.swt.SWT.BORDER)]]></source>
-		<x-attribute ns="http://www.eclipse.org/xwt" name="Style" value="BORDER"/>
-	</creation>
-	<!-- CONSTRUCTORS -->
-	<constructors>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-			<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-				<editor id="style">
-					<parameter name="class">org.eclipse.swt.SWT</parameter>
-					<parameter name="set">BORDER DROP_DOWN</parameter>
-					<parameter name="select0">type DATE DATE TIME CALENDAR</parameter>
-					<parameter name="select1">format MEDIUM MEDIUM SHORT LONG</parameter>
-				</editor>
-			</parameter>
-		</constructor>
-	</constructors>
-	<!-- PROPERTIES -->
-	<properties-advanced names="year month day hours minutes seconds"/>
-	<method-property title="date" method="setDate(int,int,int)"/>
-	<!-- MORPHING -->
-	<morphTargets>
-		<morphTarget class="org.eclipse.swt.widgets.Text"/>
-		<morphTarget class="org.eclipse.swt.widgets.Combo"/>
-		<morphTarget class="org.eclipse.swt.widgets.Label"/>
-		<morphTarget class="org.eclipse.swt.widgets.Spinner"/>
-		<morphTarget class="org.eclipse.swt.widgets.Button"/>
-	</morphTargets>
-	<!-- PARAMETERS -->
-	<parameters>
-		<parameter name="layout.has">false</parameter>
-		<!-- untyped events -->
-		<parameter name="RCP.untyped.events: org.eclipse.swt.widgets.DateTime"><![CDATA[
-			Selection
-		]]></parameter>
-	</parameters>
-</component>
diff --git a/org.eclipse.wb.rcp/wbp-meta/3.4/org/eclipse/swt/widgets/ProgressBar.wbp-component.xml b/org.eclipse.wb.rcp/wbp-meta/3.4/org/eclipse/swt/widgets/ProgressBar.wbp-component.xml
deleted file mode 100644
index 0fa615c18..000000000
--- a/org.eclipse.wb.rcp/wbp-meta/3.4/org/eclipse/swt/widgets/ProgressBar.wbp-component.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://www.eclipse.org/wb/WBPComponent">
-	<description>Instances of the receiver represent is an unselectable user interface object that is used to
-		display progress, typically in the form of a bar.</description>
-	<!-- CREATION -->
-	<creation>
-		<source><![CDATA[new org.eclipse.swt.widgets.ProgressBar(%parent%, org.eclipse.swt.SWT.NONE)]]></source>
-	</creation>
-	<!-- CONSTRUCTORS -->
-	<constructors>
-		<constructor>
-			<parameter type="org.eclipse.swt.widgets.Composite" parent="true"/>
-			<parameter type="int" defaultSource="org.eclipse.swt.SWT.NONE">
-				<editor id="style">
-					<parameter name="class">org.eclipse.swt.SWT</parameter>
-					<parameter name="set">BORDER SMOOTH INDETERMINATE:unknown</parameter>
-					<parameter name="select0">dir HORIZONTAL HORIZONTAL VERTICAL</parameter>
-				</editor>
-			</parameter>
-		</constructor>
-	</constructors>
-	<!-- METHODS -->
-	<methods>
-		<method name="setMinimum" order="after setMaximum(int)">
-			<parameter type="int"/>
-		</method>
-		<method name="setSelection" order="after setMinimum(int)">
-			<parameter type="int"/>
-		</method>
-	</methods>
-	<!-- PROPERTIES -->
-	<properties-preferred names="minimum maximum selection"/>
-	<property id="setState(int)">
-		<editor id="staticField">
-			<parameter name="class">org.eclipse.swt.SWT</parameter>
-			<parameter name="fields">NORMAL ERROR PAUSED</parameter>
-		</editor>
-	</property>
-</component>
\ No newline at end of file