diff --git a/pom.xml b/pom.xml
index dac8cbe4ca0..8b531cd8a66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
 	<properties>
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git</tycho.scmUrl>
-		<tycho-version>1.3.0</tycho-version>
+		<tycho-version>1.6.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 
 		<cbi-plugins.version>1.1.4</cbi-plugins.version>
@@ -364,10 +364,6 @@
 	<modules>
 		<!-- Terminal features and plug-ins -->
 		<module>terminal</module>
-		<!-- RSE features and plug-ins -->
-		<module>rse</module>
-		<!-- Windows CE subsystem and support for RSE - requires 32-bit Eclipse so not supported in Eclipse 4.10+ -->
-		<!-- <module>wince</module> -->
 		<module>site</module>
 	</modules>
 </project>
diff --git a/site/category.xml b/site/category.xml
index d99619af4a0..58e44b5cb64 100644
--- a/site/category.xml
+++ b/site/category.xml
@@ -10,14 +10,6 @@
  -->
 
 <site>
-   <feature id="org.eclipse.rse"><category name="rse_main"/></feature>
-   <feature id="org.eclipse.rse.sdk"><category name="rse_main"/></feature>
-   <feature id="org.eclipse.rse.terminals"><category name="rse_main"/></feature>
-   <feature id="org.eclipse.rse.useractions"><category name="rse_main"/></feature>
-
-   <feature id="org.eclipse.rse.examples"><category name="rse_optional"/></feature>
-   <feature id="org.eclipse.rse.scp"><category name="rse_optional"/></feature>
-
    <!-- Terminal Control Features -->
    <feature id="org.eclipse.tm.terminal.control.feature"><category name="terminal_main"/></feature>
    <feature id="org.eclipse.tm.terminal.control.sdk.feature"><category name="terminal_sdk"/></feature>
@@ -27,8 +19,6 @@
    <feature id="org.eclipse.tm.terminal.connector.local.sdk.feature"><category name="terminal_sdk"/></feature>
    <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature"><category name="terminal_main"/></feature>
    <feature id="org.eclipse.tm.terminal.connector.cdtserial.sdk.feature"><category name="terminal_sdk"/></feature>
-   <!-- Bug 536800 remove <feature id="org.eclipse.tm.terminal.connector.serial.feature"><category name="terminal_main"/></feature> -->
-   <!-- Bug 536800 remove <feature id="org.eclipse.tm.terminal.connector.serial.sdk.feature"><category name="terminal_sdk"/></feature> -->
    <feature id="org.eclipse.tm.terminal.connector.ssh.feature"><category name="terminal_main"/></feature>
    <feature id="org.eclipse.tm.terminal.connector.ssh.sdk.feature"><category name="terminal_sdk"/></feature>
    <feature id="org.eclipse.tm.terminal.connector.telnet.feature"><category name="terminal_main"/></feature>
@@ -39,8 +29,6 @@
    <!-- Terminal View Features -->
    <feature id="org.eclipse.tm.terminal.view.feature"><category name="terminal_main"/></feature>
    <feature id="org.eclipse.tm.terminal.view.sdk.feature"><category name="terminal_sdk"/></feature>
-   <feature id="org.eclipse.tm.terminal.view.rse.feature"><category name="terminal_main"/></feature>
-   <feature id="org.eclipse.tm.terminal.view.rse.sdk.feature"><category name="terminal_sdk"/></feature>
 
    <!-- TM Terminal "all-in-one" features -->
    <feature id="org.eclipse.tm.terminal.feature"><category name="terminal_main"/></feature>
@@ -48,8 +36,6 @@
 
    <bundle id="org.eclipse.tm.terminal.test"><category name="terminal_optional"/></bundle>
    <bundle id="org.apache.commons.net"><category name="deps"/></bundle>
-   <!-- Bug 536800 gnu.io.rxtx is a workswith dep we are not allowed to redistribute --> 
-   <!-- <bundle id="gnu.io.rxtx"><category name="deps"/></bundle> -->
 
    <!-- other hidden features / deps -->
    <feature id="org.eclipse.cdt.native"/>
@@ -70,21 +56,6 @@
       </description>
    </category-def>
 
-   <category-def name="rse_main" label="RSE Features">
-      <description>
-         RSE Features
-      </description>
-   </category-def>
-   <category-def name="rse_sdk" label="RSE SDK Features">
-      <description>
-         RSE SDK Features
-      </description>
-   </category-def>
-   <category-def name="rse_optional" label="RSE Optional Add-Ons">
-      <description>
-         RSE Examples, Tests and Incubation Plug-ins
-      </description>
-   </category-def>
 
    <category-def name="deps" label="Dependencies">
       <description>
diff --git a/terminal/features/pom.xml b/terminal/features/pom.xml
index 3d22c122c41..1da93e88e52 100644
--- a/terminal/features/pom.xml
+++ b/terminal/features/pom.xml
@@ -40,8 +40,6 @@
 
 		<module>org.eclipse.tm.terminal.view.feature</module>
 		<module>org.eclipse.tm.terminal.view.sdk.feature</module>
-		<module>org.eclipse.tm.terminal.view.rse.feature</module>
-		<module>org.eclipse.tm.terminal.view.rse.sdk.feature</module>
 
 		<module>org.eclipse.tm.terminal.feature</module>
 		<module>org.eclipse.tm.terminal.sdk.feature</module>
@@ -67,24 +65,5 @@
 				<module>org.eclipse.tm.terminal.connector.cdtserial.sdk.feature</module>
 			</modules>
 		</profile>
-		<profile>
-			<!-- Bug 536800 depends on gnu.io.rxtx which is a workswith dep we are not allowed to redistribute --> 
-			<!-- The rxtxserial connector doesn't build on MacOSX. -->
-			<id>rxtxserial</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<!-- Bug 536800 remove from reactor <modules>
-				<module>org.eclipse.tm.terminal.connector.serial.feature</module>
-				<module>org.eclipse.tm.terminal.connector.serial.sdk.feature</module>
-			</modules> -->
-			<repositories>
-				<repository>
-					<id>rxtx</id>
-					<url>http://archive.eclipse.org/tm/updates/rxtx</url>
-					<layout>p2</layout>
-				</repository>
-			</repositories>
-		</profile>
 	</profiles>
 </project>
diff --git a/terminal/plugins/pom.xml b/terminal/plugins/pom.xml
index 5ba8756be6e..64a12adce3c 100644
--- a/terminal/plugins/pom.xml
+++ b/terminal/plugins/pom.xml
@@ -36,7 +36,6 @@
 
 		<module>org.eclipse.tm.terminal.view.core</module>
 		<module>org.eclipse.tm.terminal.view.ui</module>
-		<module>org.eclipse.tm.terminal.view.ui.rse</module>
 
 		<module>org.eclipse.tm.terminal.test</module>
 	</modules>
diff --git a/terminal/readme.txt b/terminal/readme.txt
deleted file mode 100644
index 4b5151f88c0..00000000000
--- a/terminal/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This repository holds the TM Terminal Component.
-Its core depends on Eclipse RCP only.
-All these Git modules should be named "org.eclipse.tm.terminal.*".
-See http://www.eclipse.org/tm/
diff --git a/terminal/terminals.psf b/terminal/terminals.psf
deleted file mode 100644
index 3a17b424333..00000000000
--- a/terminal/terminals.psf
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<psf version="2.0">
-<provider id="org.eclipse.egit.core.GitProvider">
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,admin"/>
-<project reference="1.0,https://git.eclipse.org/r/ptp/org.eclipse.remote,master,features/org.eclipse.remote-feature"/>
-<project reference="1.0,https://git.eclipse.org/r/ptp/org.eclipse.remote,master,bundles/org.eclipse.remote.core"/>
-<project reference="1.0,https://git.eclipse.org/r/ptp/org.eclipse.remote,master,bundles/org.eclipse.remote.jsch.core"/>
-<project reference="1.0,https://git.eclipse.org/r/ptp/org.eclipse.remote,master,bundles/org.eclipse.remote.jsch.ui"/>
-<project reference="1.0,https://git.eclipse.org/r/ptp/org.eclipse.remote,master,bundles/org.eclipse.remote.ui"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.local"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.local.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.local.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.process"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.cdtserial"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.cdtserial.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.serial"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.serial.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.serial.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.ssh"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.ssh.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.ssh.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.telnet"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.telnet.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.telnet.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.control"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.control.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.control.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.connector.remote"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.remote.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.connector.remote.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,repos/org.eclipse.tm.terminal.repo"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.test"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.view.core"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.view.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.view.rse.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.view.rse.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,features/org.eclipse.tm.terminal.view.sdk.feature"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.view.ui"/>
-<project reference="1.0,https://git.eclipse.org/r/tm/org.eclipse.tm.terminal,master,plugins/org.eclipse.tm.terminal.view.ui.rse"/>
-</provider>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424180520433_7" label="Remote Services" name="Remote Services">
-<item elementID="=org.eclipse.remote.jsch.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.remote.jsch.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.remote.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.remote.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424180691591_8" label="Remote Services (Features)" name="Remote Services (Features)">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.remote-feature" type="4"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1429262080908_11" label="Terminal &quot;All-In-One&quot; (Features)" name="Terminal &quot;All-In-One&quot; (Features)">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.feature" type="4"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1429252903893_9" label="Terminal Connectors" name="Terminal Connectors">
-<item elementID="=org.eclipse.tm.terminal.connector.remote" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.connector.cdtserial" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.connector.serial" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.connector.telnet" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.connector.process" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.connector.ssh" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.connector.local" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1429252914126_10" label="Terminal Connectors (Features)" name="Terminal Connectors (Features)">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.ssh.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.ssh.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.remote.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.remote.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.cdtserial.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.serial.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.serial.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.local.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.local.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.telnet.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.connector.telnet.sdk.feature" type="4"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424167614352_4" label="Terminal Control" name="Terminal Control">
-<item elementID="=org.eclipse.tm.terminal.test" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.control" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424167619686_5" label="Terminal Control (Features)" name="Terminal Control (Features)">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.control.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.control.sdk.feature" type="4"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424167596901_2" label="Terminals View" name="Terminals View">
-<item elementID="=org.eclipse.tm.terminal.view.ui.rse" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.view.ui" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-<item elementID="=org.eclipse.tm.terminal.view.core" factoryID="org.eclipse.jdt.ui.PersistableJavaElementFactory"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424167602531_3" label="Terminals View (Features)" name="Terminals View (Features)">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.view.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.view.sdk.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.view.rse.feature" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.view.rse.sdk.feature" type="4"/>
-</workingSets>
-<workingSets editPageId="org.eclipse.jdt.ui.JavaWorkingSetPage" id="1424172791946_6" label="Administration" name="Administration">
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/org.eclipse.tm.terminal.repo" type="4"/>
-<item factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/Administration (TM Terminal)" type="4"/>
-</workingSets>
-</psf>
\ No newline at end of file