feature[ats_ATS107238]: remove unnecessary projects

79 files changed, 0 insertions, 2698 deletions

diff --git a/org.eclipse.ote.commands.messages/.classpath b/org.eclipse.ote.commands.messages/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.commands.messages/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.commands.messages/.project b/org.eclipse.ote.commands.messages/.project
deleted file mode 100644
index f8b8b7fb9..000000000
--- a/org.eclipse.ote.commands.messages/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.commands.messages</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.commands.messages/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.commands.messages/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.commands.messages/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.commands.messages/META-INF/MANIFEST.MF b/org.eclipse.ote.commands.messages/META-INF/MANIFEST.MF
deleted file mode 100644
index 35af79d1a..000000000
--- a/org.eclipse.ote.commands.messages/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OTE Commands Messages (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.commands.messages
-Bundle-Version: 0.11.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.ote.message,
- org.eclipse.osee.ote.message.data,
- org.eclipse.osee.ote.message.elements,
- org.eclipse.ote.bytemessage
-Export-Package: org.eclipse.ote.commands.messages
diff --git a/org.eclipse.ote.commands.messages/build.properties b/org.eclipse.ote.commands.messages/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/org.eclipse.ote.commands.messages/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.eclipse.ote.commands.messages/pom.xml b/org.eclipse.ote.commands.messages/pom.xml
deleted file mode 100644
index 3e3e5761e..000000000
--- a/org.eclipse.ote.commands.messages/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.commands.messages</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>Eclipse OTE Commands Messages (Incubation)</name>
- <!--
-   <build>
-     workaround for https://issues.sonatype.org/browse/TYCHO-168 
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/CancelCommand.java b/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/CancelCommand.java
deleted file mode 100644
index 31fcef7e7..000000000
--- a/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/CancelCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.commands.messages;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class CancelCommand extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/cancelcommand";
-   
-   private static final int DEFAULT_BYTE_SIZE = 32;
-   
-   public ArrayElement UUID_DATA_SESSION;
-   public ArrayElement UUID_DATA_CMD_ID; 
-   
-   
-   public CancelCommand(){
-      super(CancelCommand.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      UUID_DATA_SESSION = new ArrayElement(this, "UUID_DATA_SESSION", getDefaultMessageData(), 0, 0, 127);
-      UUID_DATA_CMD_ID = new ArrayElement(this, "UUID_DATA_CMD_ID", getDefaultMessageData(), 16, 0, 127);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA_SESSION.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA_SESSION.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-   
-   public void setCmdUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA_CMD_ID.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getCmdUUID(){
-      ByteBuffer buffer = UUID_DATA_CMD_ID.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-
-}
diff --git a/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/CommandComplete.java b/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/CommandComplete.java
deleted file mode 100644
index 7df392485..000000000
--- a/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/CommandComplete.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.commands.messages;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.osee.ote.message.elements.StringElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class CommandComplete extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/commandcomplete";
-   
-   private static final int DEFAULT_BYTE_SIZE = 64;
-   
-   public ArrayElement UUID_DATA_SESSION;
-   public ArrayElement UUID_DATA_CMD_ID; 
-   public StringElement STATUS;
-   
-   
-   public CommandComplete(){
-      super(CommandComplete.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      UUID_DATA_SESSION = new ArrayElement(this, "UUID_DATA_SESSION", getDefaultMessageData(), 0, 0, 127);
-      UUID_DATA_CMD_ID = new ArrayElement(this, "UUID_DATA_CMD_ID", getDefaultMessageData(), 16, 0, 127);
-      STATUS = new StringElement(this, "STATUS", getDefaultMessageData(), 32, 0, 8*32-1);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA_SESSION.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA_SESSION.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-   
-   public void setCmdUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA_CMD_ID.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getCmdUUID(){
-      ByteBuffer buffer = UUID_DATA_CMD_ID.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-
-   public void setStatus(String status) {
-      STATUS.setValue(status);
-   }
-   
-   public String getStatus(){
-      return STATUS.getValue();
-   }
-
-}
diff --git a/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/RunTests.java b/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/RunTests.java
deleted file mode 100644
index 88548e896..000000000
--- a/org.eclipse.ote.commands.messages/src/org/eclipse/ote/commands/messages/RunTests.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.commands.messages;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.eclipse.osee.framework.jdk.core.type.IPropertyStore;
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class RunTests extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/runtests";
-   
-   private static final int DEFAULT_BYTE_SIZE = 32;
-   
-   public ArrayElement UUID_DATA_SESSION;
-   public ArrayElement UUID_DATA_CMD_ID; 
-   public ArrayElement PROPERTY_DATA;
-
-   private IPropertyStore global;
-   private List<IPropertyStore> scripts;
-   private IPropertyStore[] properties;
-   
-   public RunTests(){
-      super(RunTests.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      UUID_DATA_SESSION = new ArrayElement(this, "UUID_DATA_SESSION", getDefaultMessageData(), 0, 0, 127);
-      UUID_DATA_CMD_ID = new ArrayElement(this, "UUID_DATA_CMD_ID", getDefaultMessageData(), 16, 0, 127);
-      PROPERTY_DATA = new ArrayElement(this, "PROPERTY_DATA", getDefaultMessageData(), 32, 0, 0);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA_SESSION.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA_SESSION.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-   
-   public void setCmdUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA_CMD_ID.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getCmdUUID(){
-      ByteBuffer buffer = UUID_DATA_CMD_ID.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-
-   public void setScriptsAndGlobalConfig(IPropertyStore global, List<IPropertyStore> scripts) throws IOException {
-      properties = null;
-      List<IPropertyStore> properties = new ArrayList<IPropertyStore>();
-      properties.add(global);
-      properties.addAll(scripts);
-      byte[] bytes = serializeObject(properties.toArray(new IPropertyStore[0]));
-      setAndGrowData(bytes, getHeaderSize() + PROPERTY_DATA.getByteOffset());
-   }
-   
-   public List<IPropertyStore> getScripts() throws IOException, ClassNotFoundException{
-      if(scripts == null) { 
-         getPropertyStoreData();
-      }
-      return scripts;
-   }
-   
-   public IPropertyStore getGlobalConfig() throws IOException, ClassNotFoundException{
-      if(global == null) { 
-         getPropertyStoreData();
-      }
-      return global;
-   }
-   
-   private IPropertyStore[] getPropertyStoreData() throws IOException, ClassNotFoundException{
-      if(properties == null) { 
-         byte[] data = getDefaultMessageData().getMem().getData();
-         int offset = getHeaderSize() + PROPERTY_DATA.getByteOffset();
-         ObjectInputStream ois = unserializeObject(data, offset, data.length - offset);
-         Object obj = ois.readObject();
-         if(obj instanceof IPropertyStore[]){
-            properties = (IPropertyStore[])obj;
-         }
-         if(properties.length > 0){
-            global = properties[0];
-         }
-         scripts = new ArrayList<IPropertyStore>();
-         for(int i = 1; i < properties.length; i++){
-            scripts.add(properties[i]);
-         }
-      }
-      return properties;
-   }
-   
-}
diff --git a/org.eclipse.ote.commands.server/.classpath b/org.eclipse.ote.commands.server/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.commands.server/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.commands.server/.project b/org.eclipse.ote.commands.server/.project
deleted file mode 100644
index 0b3e0d6cd..000000000
--- a/org.eclipse.ote.commands.server/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.commands.server</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.commands.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.commands.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.commands.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.commands.server/META-INF/MANIFEST.MF b/org.eclipse.ote.commands.server/META-INF/MANIFEST.MF
deleted file mode 100644
index 47800e18b..000000000
--- a/org.eclipse.ote.commands.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OTE Commands Server (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.commands.server
-Bundle-Version: 0.11.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/EnvironmentCommandComponent.xml
-Import-Package: org.eclipse.osee.connection.service,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.framework.logging,
- org.eclipse.osee.ote.core.environment,
- org.eclipse.osee.ote.core.environment.status,
- org.eclipse.osee.ote.core.framework,
- org.eclipse.osee.ote.core.framework.command,
- org.eclipse.osee.ote.message,
- org.eclipse.ote.bytemessage,
- org.eclipse.ote.commands.messages,
- org.eclipse.ote.statemachine,
- org.osgi.service.event;version="1.3.0"
diff --git a/org.eclipse.ote.commands.server/OSGI-INF/EnvironmentCommandComponent.xml b/org.eclipse.ote.commands.server/OSGI-INF/EnvironmentCommandComponent.xml
deleted file mode 100644
index d48aecd32..000000000
--- a/org.eclipse.ote.commands.server/OSGI-INF/EnvironmentCommandComponent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.ote.commands.server">
-   <implementation class="org.eclipse.ote.commands.server.EnvironmentCommandHandler"/>
-   <reference bind="bindTestEnvironmentInterface" cardinality="1..1" interface="org.eclipse.osee.ote.core.environment.TestEnvironmentInterface" name="TestEnvironmentInterface" policy="static" unbind="unbindTestEnvironmentInterface"/>
-   <reference bind="bindEventAdmin" unbind="unbindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static"/>
-</scr:component>
diff --git a/org.eclipse.ote.commands.server/build.properties b/org.eclipse.ote.commands.server/build.properties
deleted file mode 100644
index 6210e849b..000000000
--- a/org.eclipse.ote.commands.server/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
-source.. = src/
diff --git a/org.eclipse.ote.commands.server/pom.xml b/org.eclipse.ote.commands.server/pom.xml
deleted file mode 100644
index a4444e786..000000000
--- a/org.eclipse.ote.commands.server/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.commands.server</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>Eclipse OTE Commands Server (Incubation)</name>
- <!--
-   <build>
-     workaround for https://issues.sonatype.org/browse/TYCHO-168 
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/CancelCommandHandler.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/CancelCommandHandler.java
deleted file mode 100644
index 1dd53e7b1..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/CancelCommandHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import org.eclipse.ote.bytemessage.OteByteMessageResponseCallable;
-import org.eclipse.ote.commands.messages.CancelCommand;
-
-public class CancelCommandHandler implements OteByteMessageResponseCallable<CancelCommand> {
-
-   private InputCancelCommand inputCancelCommand;
-
-   public CancelCommandHandler(InputCancelCommand inputCancelCommand) {
-      this.inputCancelCommand = inputCancelCommand;
-   }
-
-   @Override
-   public synchronized void call(CancelCommand received) {
-      InputCancelCommand newInput = new InputCancelCommand(inputCancelCommand);
-      newInput.set(received);
-      newInput.addToStateMachineQueue();
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/CommandCompleteNotifier.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/CommandCompleteNotifier.java
deleted file mode 100644
index c806a947e..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/CommandCompleteNotifier.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import java.util.UUID;
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.core.framework.command.ICommandHandle;
-
-public class CommandCompleteNotifier implements Runnable {
-
-   private ICommandHandle handle;
-   private StateRunningCommand stateRunningCommand;
-   private UUID sessionUUID;
-   private UUID cmdUUID;
-
-   public CommandCompleteNotifier(ICommandHandle handle, UUID sessionUUID, UUID cmdUUID, StateRunningCommand stateRunningCommand) {
-      this.handle = handle;
-      this.sessionUUID = sessionUUID;
-      this.cmdUUID = cmdUUID;
-      this.stateRunningCommand = stateRunningCommand;
-   }
-
-   @Override
-   public void run() {
-      try{
-         while(!handle.isDone()){
-            try{
-               handle.get();
-               if(!handle.isDone()){
-                  Thread.sleep(1000);
-               }
-            }catch(Throwable th){
-               OseeLog.log(getClass(), Level.SEVERE, th);
-            }
-         }
-      } catch (Throwable th){
-         try{
-            if(!handle.isDone()){
-               handle.cancelAll(true);
-            }
-         } catch (Throwable th2){
-            OseeLog.log(getClass(), Level.SEVERE, th2);
-         }
-      } finally {
-         this.stateRunningCommand.commandComplete(sessionUUID, cmdUUID);
-      }
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/EnvironmentCommandHandler.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/EnvironmentCommandHandler.java
deleted file mode 100644
index 761fe9be7..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/EnvironmentCommandHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.core.environment.TestEnvironmentInterface;
-import org.eclipse.ote.bytemessage.OteByteMessageResponseFuture;
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.commands.messages.CancelCommand;
-import org.eclipse.ote.commands.messages.RunTests;
-import org.eclipse.ote.statemachine.StateMachine;
-import org.osgi.service.event.EventAdmin;
-
-public class EnvironmentCommandHandler {
-
-   private TestEnvironmentInterface env;
-   private EventAdmin eventAdmin;
-   private StateMachine stateMachine;
-   private OteByteMessageResponseFuture<CancelCommand> cancelCommand;
-   private OteByteMessageResponseFuture<RunTests> runTestsFuture;
-   
-   public void start(){
-      try{
-         OteSendByteMessage sender = new OteSendByteMessage(eventAdmin);
-         stateMachine = new StateMachine("ServerCommandProcessor");
-
-         InputRunTests inputRunTests = new InputRunTests(stateMachine);
-         InputCancelCommand inputCancelCommand = new InputCancelCommand(stateMachine);
-         InputCommandsDone inputCommandsDone = new InputCommandsDone(stateMachine);
-
-         cancelCommand = sender.asynchResponse(CancelCommand.class, CancelCommand.TOPIC, new CancelCommandHandler(inputCancelCommand));
-         runTestsFuture = sender.asynchResponse(RunTests.class, RunTests.TOPIC, new HandleRunTests(inputRunTests)); 
-         
-         StateWaitingForCommand stateWaitingForCommand = new StateWaitingForCommand();
-         StateRunningCommand stateRunningCommand = new StateRunningCommand(env, inputCommandsDone, sender);
-
-         stateMachine.setDefaultInitialState(stateWaitingForCommand);
-         stateMachine.newTransition(stateWaitingForCommand, inputRunTests, stateRunningCommand);
-         stateMachine.newTransition(stateRunningCommand, inputRunTests, stateRunningCommand);
-         stateMachine.newTransition(stateRunningCommand, inputCancelCommand, stateRunningCommand);
-         stateMachine.newTransition(stateRunningCommand, inputCommandsDone, stateWaitingForCommand);
-
-         stateMachine.initialize();
-         stateMachine.start();
-         
-      } catch (Throwable th){
-         OseeLog.log(getClass(), Level.SEVERE, "statemachine initialization failed", th);
-      }
-   }
-   
-   public void stop(){
-      try{
-         cancelCommand.cancel();
-         runTestsFuture.cancel();
-         stateMachine.stop();
-      } catch (Throwable th){
-         OseeLog.log(getClass(), Level.SEVERE, "Failed to stop statemachine", th);
-      }
-   }
-   
-   public void bindTestEnvironmentInterface(TestEnvironmentInterface env){
-      this.env = env;
-   }
-   
-   public void unbindTestEnvironmentInterface(TestEnvironmentInterface env){
-      this.env = null;
-   }
-   
-   public void bindEventAdmin(EventAdmin eventAdmin){
-      this.eventAdmin = eventAdmin;
-   }
-   
-   public void unbindEventAdmin(EventAdmin eventAdmin){
-      this.eventAdmin = null;
-   }
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/HandleRunTests.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/HandleRunTests.java
deleted file mode 100644
index da32692be..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/HandleRunTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import org.eclipse.ote.bytemessage.OteByteMessageResponseCallable;
-import org.eclipse.ote.commands.messages.RunTests;
-
-class HandleRunTests implements OteByteMessageResponseCallable<RunTests> {
-
-   private InputRunTests inputRunTests;
-
-   public HandleRunTests(InputRunTests inputRunTests) {
-      this.inputRunTests = inputRunTests;
-   }
-
-   @Override
-   public synchronized void call(RunTests received) {
-      InputRunTests newInput = new InputRunTests(inputRunTests);
-      newInput.set(received);
-      newInput.addToStateMachineQueue();
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputCancelCommand.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputCancelCommand.java
deleted file mode 100644
index 81162b6c1..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputCancelCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import org.eclipse.ote.commands.messages.CancelCommand;
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputCancelCommand extends BaseInput {
-
-   public final static Object TYPE = new Object();
-   private CancelCommand received;
-   
-   public InputCancelCommand(StateMachine stateMachine) {
-      super(stateMachine);
-   }
-   
-   public InputCancelCommand(InputCancelCommand inputCancelCommand){
-      super(inputCancelCommand);
-      this.received = inputCancelCommand.received;
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-
-   public void set(CancelCommand received) {
-      this.received = received;
-   }
-   
-   public CancelCommand get(){
-      return this.received;
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputCommandsDone.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputCommandsDone.java
deleted file mode 100644
index ff840810e..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputCommandsDone.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputCommandsDone extends BaseInput {
-
-   public final static Object TYPE = new Object();
-   
-   public InputCommandsDone(StateMachine stateMachine) {
-      super(stateMachine);
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputRunTests.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputRunTests.java
deleted file mode 100644
index 6c842fa44..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/InputRunTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import org.eclipse.ote.commands.messages.RunTests;
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputRunTests extends BaseInput {
-
-   public final static Object TYPE = new Object();
-   private RunTests runTests;
-   
-   public InputRunTests(StateMachine stateMachine) {
-      super(stateMachine);
-   }
-
-   public InputRunTests(InputRunTests inputRunTests) {
-      super(inputRunTests);
-      this.runTests = inputRunTests.runTests;
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-
-   public void set(RunTests received) {
-      this.runTests = received;
-   }
-   
-   public RunTests get(){
-      return this.runTests;
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/RunTestsCommand.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/RunTestsCommand.java
deleted file mode 100644
index 2e311ee07..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/RunTestsCommand.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import java.io.Serializable;
-import java.rmi.server.ExportException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.Future;
-
-import org.eclipse.osee.framework.jdk.core.type.IPropertyStore;
-import org.eclipse.osee.framework.logging.IHealthStatus;
-import org.eclipse.osee.ote.core.environment.TestEnvironment;
-import org.eclipse.osee.ote.core.environment.status.CommandEndedStatusEnum;
-import org.eclipse.osee.ote.core.environment.status.OTEStatusBoard;
-import org.eclipse.osee.ote.core.framework.IMethodResult;
-import org.eclipse.osee.ote.core.framework.ReturnCode;
-import org.eclipse.osee.ote.core.framework.command.ICommandHandle;
-import org.eclipse.osee.ote.core.framework.command.ITestCommandResult;
-import org.eclipse.osee.ote.core.framework.command.ITestContext;
-import org.eclipse.osee.ote.core.framework.command.ITestServerCommand;
-import org.eclipse.osee.ote.core.framework.command.RunTestsKeys;
-import org.eclipse.osee.ote.core.framework.command.TestCommandResult;
-import org.eclipse.osee.ote.message.IMessageTestContext;
-
-class RunTestsCommand implements ITestServerCommand, Serializable {
-
-   private static final long serialVersionUID = 7408758537342855854L;
-   private final IPropertyStore global;
-   private final List<IPropertyStore> scripts;
-   private volatile boolean cancel = false;
-   private volatile boolean isRunning = false;
-   private final UUID sessionKey;
-   private final String guid;
-   private final List<RunTestsHandle> handles;
-
-   private TestEnvironment environment;
-
-   public RunTestsCommand(String guid, UUID sessionKey, IPropertyStore global, List<IPropertyStore> scripts) {
-      handles = new ArrayList<RunTestsHandle>();
-      this.global = global;
-      this.scripts = scripts;
-      this.sessionKey = sessionKey;
-      this.guid = guid;
-   }
-
-   public UUID getSessionKey() {
-      return sessionKey;
-   }
-
-   @Override
-   public ICommandHandle createCommandHandle(Future<ITestCommandResult> result, ITestContext context) throws ExportException {
-      RunTestsHandle handle = new RunTestsHandle(result, context, this);
-      handles.add(handle);
-      return handle;
-   }
-
-   @Override
-   public ITestCommandResult execute(TestEnvironment environment, OTEStatusBoard statusBoard) throws Exception {
-      environment.setBatchMode(global.getBoolean(RunTestsKeys.batchmode.name()));
-      ITestCommandResult retVal = TestCommandResult.SUCCESS;
-      isRunning = true;
-      IMessageTestContext msgContext = (IMessageTestContext) environment;
-      this.environment = environment;
-      msgContext.resetScriptLoader(null, global.getArray(RunTestsKeys.classpath.name()));
-      for (IPropertyStore store : scripts) {
-         if (cancel) {
-            statusBoard.onTestComplete(store.get(RunTestsKeys.testClass.name()),
-               store.get(RunTestsKeys.serverOutfilePath.name()),
-               store.get(RunTestsKeys.clientOutfilePath.name()), CommandEndedStatusEnum.ABORTED,
-               new ArrayList<IHealthStatus>());
-            retVal = TestCommandResult.CANCEL;
-            continue;
-
-         }
-         statusBoard.onTestStart(store.get(RunTestsKeys.testClass.name()), store.get(RunTestsKeys.serverOutfilePath.name()), store.get(RunTestsKeys.clientOutfilePath.name()));
-         IMethodResult runResults = environment.getRunManager().run(environment, store);
-
-         CommandEndedStatusEnum status = CommandEndedStatusEnum.RAN_TO_COMPLETION;
-         if (runResults.getReturnCode() == ReturnCode.ABORTED) {
-            status = CommandEndedStatusEnum.ABORTED;
-         }
-         if (runResults.getReturnCode() == ReturnCode.ERROR) {
-            status = CommandEndedStatusEnum.EXCEPTION;
-         }
-
-         statusBoard.onTestComplete(store.get(RunTestsKeys.testClass.name()),
-            store.get(RunTestsKeys.serverOutfilePath.name()), store.get(RunTestsKeys.clientOutfilePath.name()),
-            status, runResults.getStatus());
-      }
-      handles.clear();
-      isRunning = false;
-      return retVal;
-   }
-
-   void cancel(boolean mayInterruptIfRunning) {
-      cancel = mayInterruptIfRunning;
-      environment.getRunManager().abort();
-   }
-
-   @Override
-   public String getGUID() {
-      return guid;
-   }
-
-   @Override
-   public UUID getUserSessionKey() {
-      return sessionKey;
-   }
-
-   public void cancelSingle(boolean mayInterruptIfRunning) {
-
-   }
-
-   boolean isRunning() {
-      return isRunning;
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/RunTestsHandle.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/RunTestsHandle.java
deleted file mode 100644
index 972874fea..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/RunTestsHandle.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import java.rmi.RemoteException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.jdk.core.util.GUID;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.core.framework.command.ICommandHandle;
-import org.eclipse.osee.ote.core.framework.command.ITestCommandResult;
-import org.eclipse.osee.ote.core.framework.command.ITestContext;
-import org.eclipse.osee.ote.core.framework.command.TestCommandResult;
-
-class RunTestsHandle implements ICommandHandle {
-   private final Future<ITestCommandResult> result;
-   private final ITestContext context;
-   private final RunTestsCommand command;
-   private final String guid;
-
-   public RunTestsHandle(Future<ITestCommandResult> result, ITestContext context, RunTestsCommand command) {
-      this.result = result;
-      this.context = context;
-      this.command = command;
-      this.guid = GUID.create();
-   }
-
-   @Override
-   public boolean cancelAll(boolean mayInterruptIfRunning) {
-      command.cancel(mayInterruptIfRunning);
-      if (command.isRunning()) {
-         return context.getRunManager().abort();
-      } else {
-         result.cancel(mayInterruptIfRunning);
-      }
-      return true;
-   }
-
-   @Override
-   public boolean cancelSingle(boolean mayInterruptIfRunning) {
-      if (command.isRunning()) {
-         context.getRunManager().abort();
-      }
-      command.cancelSingle(mayInterruptIfRunning);
-      return true;
-   }
-
-   @Override
-   public ITestCommandResult get() {
-      try {
-         return result.get();
-      } catch (InterruptedException e) {
-         OseeLog.log(getClass(), Level.SEVERE, String.format(
-               "Command [%s] encountered an error while trying to retrieve status.", command.toString()), e);
-      } catch (ExecutionException e) {
-    	  OseeLog.log(getClass(), Level.SEVERE, String.format(
-               "Command [%s] encountered an error while trying to retrieve status.", command.toString()), e);
-      }
-      return TestCommandResult.FAIL;
-   }
-
-   @Override
-   public boolean isCancelled() {
-      return result.isCancelled();
-   }
-
-   @Override
-   public boolean isDone() {
-      return result.isDone();
-   }
-
-   @Override
-   public String getCommandKey() {
-      return guid;
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/StateRunningCommand.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/StateRunningCommand.java
deleted file mode 100644
index 15f3c8cfa..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/StateRunningCommand.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.core.environment.TestEnvironmentInterface;
-import org.eclipse.osee.ote.core.framework.command.ICommandHandle;
-import org.eclipse.osee.ote.core.framework.command.ITestCommandResult;
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.commands.messages.CancelCommand;
-import org.eclipse.ote.commands.messages.CommandComplete;
-import org.eclipse.ote.commands.messages.RunTests;
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.BaseState;
-
-public class StateRunningCommand extends BaseState {
-
-   private TestEnvironmentInterface env;
-   private InputCommandsDone inputCommandsDone;
-   private ConcurrentHashMap<String, ICommandHandle> commands;
-   private OteSendByteMessage sender;
-   
-   public StateRunningCommand(TestEnvironmentInterface env, InputCommandsDone inputCommandsDone, OteSendByteMessage sender) {
-      this.env = env;
-      this.inputCommandsDone = inputCommandsDone;
-      this.sender = sender;
-      commands = new ConcurrentHashMap<String, ICommandHandle>();
-   }
-
-   @Override
-   public synchronized void run(BaseInput input) {
-      if(InputRunTests.TYPE == input.getType()){
-         try{
-            RunTests runTests = ((InputRunTests)input).get();
-            String cmdId = runTests.getCmdUUID().toString();
-            RunTestsCommand command = new RunTestsCommand(cmdId, null, runTests.getGlobalConfig(), runTests.getScripts());
-            ICommandHandle handle = env.addCommand(command);
-            commands.put(cmdId, handle);
-            Thread th = new Thread(new CommandCompleteNotifier(handle, runTests.getSessionUUID(), runTests.getCmdUUID(), this));
-            th.setName("Waiting For Command " + cmdId);
-            th.setDaemon(true);
-            th.start();
-         } catch (Throwable th){
-            OseeLog.log(getClass(), Level.SEVERE, th);
-         }
-      } else if (InputCancelCommand.TYPE == input.getType()){
-         InputCancelCommand cancel = (InputCancelCommand)input;
-         CancelCommand cancelcommand =cancel.get();
-         cancelcommand.getSessionUUID();
-         String cmdId = cancelcommand.getCmdUUID().toString();
-         ICommandHandle handle = commands.remove(cmdId);
-         try {
-            handle.cancelAll(true);
-         } catch (Throwable th) {
-            OseeLog.log(getClass(), Level.SEVERE, th);
-         }
-      } 
-   }
-
-   @Override
-   public void entry() {
-
-   }
-   
-   synchronized void commandComplete(UUID sessionId, UUID commandId){
-      ICommandHandle handle = commands.remove(commandId.toString());
-      String status = "unknown";
-      if(handle != null){
-         ITestCommandResult result;
-         try {
-            result = handle.get();
-            status = result.getStatus().name();
-         } catch (Throwable th) {
-            OseeLog.log(getClass(), Level.SEVERE, th);
-         }
-      }
-      CommandComplete complete = new CommandComplete();
-      complete.setSessionUUID(sessionId);
-      complete.setCmdUUID(commandId);
-      complete.setStatus(status);
-      sender.asynchSend(complete);
-      if(commands.size() == 0){
-         inputCommandsDone.addToStateMachineQueue();
-      }
-   }
-
-}
diff --git a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/StateWaitingForCommand.java b/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/StateWaitingForCommand.java
deleted file mode 100644
index 4cca3fa7b..000000000
--- a/org.eclipse.ote.commands.server/src/org/eclipse/ote/commands/server/StateWaitingForCommand.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.ote.commands.server;
-
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.BaseState;
-
-public class StateWaitingForCommand extends BaseState{
-
-   public StateWaitingForCommand() {
-   }
-
-   @Override
-   public void run(BaseInput input) {
-      //send the input along to the state that does the real work, this is kind of silly
-      input.addToStateMachineQueue();
-   }
-
-   @Override
-   public void entry() {
-      
-   }
-
-}
diff --git a/org.eclipse.ote.connect.messages.test/.classpath b/org.eclipse.ote.connect.messages.test/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.connect.messages.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.connect.messages.test/.project b/org.eclipse.ote.connect.messages.test/.project
deleted file mode 100644
index 97f125981..000000000
--- a/org.eclipse.ote.connect.messages.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.connect.messages.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.connect.messages.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.connect.messages.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.connect.messages.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.connect.messages.test/META-INF/MANIFEST.MF b/org.eclipse.ote.connect.messages.test/META-INF/MANIFEST.MF
deleted file mode 100644
index ef12353cb..000000000
--- a/org.eclipse.ote.connect.messages.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OTE Connect Messages Test (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.connect.messages.test
-Bundle-Version: 0.11.0.qualifier
-Fragment-Host: org.eclipse.ote.connect.messages;bundle-version="0.11.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit,
- org.eclipse.equinox.event;bundle-version="1.2.200"
-Import-Package: org.eclipse.osee.framework.logging,
- org.eclipse.ote.bytemessage,
- org.eclipse.ote.services.core,
- org.osgi.framework;version="1.7.0",
- org.osgi.service.event;version="1.3.0"
diff --git a/org.eclipse.ote.connect.messages.test/build.properties b/org.eclipse.ote.connect.messages.test/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/org.eclipse.ote.connect.messages.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.eclipse.ote.connect.messages.test/pom.xml b/org.eclipse.ote.connect.messages.test/pom.xml
deleted file mode 100644
index 1fc09b77a..000000000
--- a/org.eclipse.ote.connect.messages.test/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.connect.messages.test</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-	<name>Eclipse OTE Connect Messages Test (Incubation)</name>
- <!--
-   <build>
-     workaround for https://issues.sonatype.org/browse/TYCHO-168 
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.connect.messages.test/src/org/eclipse/ote/connect/messages/RespondAfterWait.java b/org.eclipse.ote.connect.messages.test/src/org/eclipse/ote/connect/messages/RespondAfterWait.java
deleted file mode 100644
index f4a4354bc..000000000
--- a/org.eclipse.ote.connect.messages.test/src/org/eclipse/ote/connect/messages/RespondAfterWait.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-import org.eclipse.ote.bytemessage.OteByteMessageUtil;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventHandler;
-
-
-public class RespondAfterWait implements EventHandler {
-
-   private int wait;
-   private OteByteMessage responseMessage;
-   private ReentrantLock lock;
-   private Condition condition;
-   private boolean notCanceled = true;
-   
-   public RespondAfterWait(OteByteMessage oteByteMessageResponse, int wait) {
-      this.wait = wait;
-      this.responseMessage = oteByteMessageResponse;
-      this.lock = new ReentrantLock();
-      this.condition = lock.newCondition();
-   }
-
-   @Override
-   public void handleEvent(Event event) {
-      lock.lock();
-      try{
-         long nano = TimeUnit.MILLISECONDS.toNanos(wait); 
-         while(nano > 0 && notCanceled ){
-            try {
-               nano = condition.awaitNanos(nano);
-            } catch (InterruptedException e) {
-               OseeLog.log(getClass(), Level.SEVERE, e);
-            }
-         }
-      } finally {
-         lock.unlock();
-      }
-      if(notCanceled){
-         OteByteMessage msg = OteByteMessageUtil.getOteByteMessage(event);
-         responseMessage.getHeader().RESPONSE_ID.setValue(msg.getHeader().MESSAGE_SEQUENCE_NUMBER.getValue());
-         OteByteMessageUtil.sendEvent(responseMessage);
-      }
-   }
-   
-   public void cancel(){
-      notCanceled = false;
-      lock.lock();
-      try{
-         condition.signal();
-      } finally {
-         lock.unlock();
-      }
-   }
-
-}
diff --git a/org.eclipse.ote.connect.messages.test/src/org/eclipse/ote/connect/messages/ServerSessionRequestTest.java b/org.eclipse.ote.connect.messages.test/src/org/eclipse/ote/connect/messages/ServerSessionRequestTest.java
deleted file mode 100644
index 4fa2b726c..000000000
--- a/org.eclipse.ote.connect.messages.test/src/org/eclipse/ote/connect/messages/ServerSessionRequestTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.UUID;
-import java.util.jar.Manifest;
-
-import junit.framework.Assert;
-
-import org.eclipse.osee.ote.core.environment.BundleDescription;
-import org.eclipse.ote.bytemessage.OteByteMessageUtil;
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.services.core.ServiceUtility;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.event.EventAdmin;
-import org.osgi.service.event.EventHandler;
-
-
-public class ServerSessionRequestTest {
-
-   @Before
-   public void setup(){
-      for(Bundle bundle:ServiceUtility.getContext().getBundles()){
-         try {
-            bundle.start();
-         } catch (BundleException e) {
-         }
-      }
-   }
-   
-   @Test
-   public void testUUID() throws IOException, ClassNotFoundException {
-      ServerConfigurationRequest request = new ServerConfigurationRequest();
-      UUID uuid = UUID.randomUUID();
-      request.setSessionUUID(uuid);
-      UUID returnedUUID = request.getSessionUUID();
-      Assert.assertEquals(uuid, returnedUUID);
-      
-      BundleDescription[] descs = new BundleDescription[126];
-      for(int i = 0; i < descs.length; i++){
-         descs[i] = new BundleDescription(new URL("http://www.google.com"),new URL("http://www.google.com"), new Manifest(), false, "");
-      }
-      request.setBundleConfiguration(descs);
-      
-      BundleDescription[] newdescs = request.getBundleConfiguration();
-      
-      Assert.assertEquals(descs.length, newdescs.length);
-      Assert.assertEquals(descs[1].getMd5Digest(), newdescs[1].getMd5Digest());
-      Assert.assertEquals(descs[1].getLocation(), newdescs[1].getLocation());
-   }
-
-   @Test
-   public void testResponse() throws Exception {
-      ServerConfigurationResponse response = new ServerConfigurationResponse();
-      response.STATUS.setValue(RequestStatus.yes);
-      RespondAfterWait respondAfterWait = new RespondAfterWait(response, 30);
-      ServiceRegistration<EventHandler> reg = OteByteMessageUtil.subscribe(ServerConfigurationRequest.TOPIC, respondAfterWait);
-      try{
-         OteSendByteMessage sender = new OteSendByteMessage(ServiceUtility.getService(EventAdmin.class));
-         ServerConfigurationRequest request = new ServerConfigurationRequest();
-         request.getHeader().RESPONSE_TOPIC.setValue(ServerConfigurationResponse.TOPIC);
-         UUID uuid = UUID.randomUUID();
-         request.setSessionUUID(uuid);
-
-         BundleDescription[] descs = new BundleDescription[126];
-         for(int i = 0; i < descs.length; i++){
-            descs[i] = new BundleDescription(new URL("http://www.google.com"),new URL("http://www.google.com"), new Manifest(), false, "");
-         }
-         request.setBundleConfiguration(descs);
-
-         ServerConfigurationResponse result = sender.synchSendAndResponse(ServerConfigurationResponse.class, request, 200);
-         
-         Assert.assertNotNull(result);
-         Assert.assertEquals(result.STATUS.getValue(), RequestStatus.yes);
-      }finally {
-         reg.unregister();
-         respondAfterWait.cancel();
-      }
-   }
-}
diff --git a/org.eclipse.ote.connect.messages/.classpath b/org.eclipse.ote.connect.messages/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.connect.messages/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.connect.messages/.project b/org.eclipse.ote.connect.messages/.project
deleted file mode 100644
index 128fd5ed1..000000000
--- a/org.eclipse.ote.connect.messages/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.connect.messages</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.connect.messages/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.connect.messages/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.connect.messages/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.connect.messages/META-INF/MANIFEST.MF b/org.eclipse.ote.connect.messages/META-INF/MANIFEST.MF
deleted file mode 100644
index 440120aea..000000000
--- a/org.eclipse.ote.connect.messages/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OTE Connect Messages (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.connect.messages
-Bundle-Version: 0.11.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.osee.framework.jdk.core.persistence,
- org.eclipse.osee.ote.core.environment,
- org.eclipse.osee.ote.message,
- org.eclipse.osee.ote.message.data,
- org.eclipse.osee.ote.message.elements,
- org.eclipse.osee.ote.message.enums,
- org.eclipse.osee.ote.message.interfaces,
- org.eclipse.ote.bytemessage
-Export-Package: org.eclipse.ote.connect.messages
diff --git a/org.eclipse.ote.connect.messages/build.properties b/org.eclipse.ote.connect.messages/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/org.eclipse.ote.connect.messages/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.eclipse.ote.connect.messages/pom.xml b/org.eclipse.ote.connect.messages/pom.xml
deleted file mode 100644
index e56109e51..000000000
--- a/org.eclipse.ote.connect.messages/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.connect.messages</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>Eclipse OTE Connect Messages (Incubation)</name>
- <!--
-   <build>
-     workaround for https://issues.sonatype.org/browse/TYCHO-168 
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/OpMode.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/OpMode.java
deleted file mode 100644
index 42f7d3edd..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/OpMode.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import org.eclipse.osee.ote.message.elements.IEnumValue;
-import org.eclipse.ote.bytemessage.EnumBase;
-import org.eclipse.ote.bytemessage.EnumSetter;
-
-public enum OpMode implements IEnumValue<OpMode>{
-   inProgress(1),
-   success(2),
-   fail(3),
-   __undefined(-99999);
-
-   private int value;
-   
-   private OpMode(int value) {
-      this.value = value;
-   }
-   
-   public int getIntValue(){
-      return value;
-   }
-
-   @Override
-   public OpMode getEnum(int value) {
-      return base.toEnum(value);
-   }
-
-   public static OpMode toEnum(int value) {
-      return base.toEnum(value);
-   }
-   
-   public static OpMode[] valuesWithoutUndefined(int value) {
-      return base.getValues();
-   }
-   
-   private static EnumBase<OpMode> base;
-   static {
-      base = new EnumBase<OpMode>(values(), OpMode.class, __undefined, new EnumSetter() {
-         @Override
-         public void setValue(int value) {
-            __undefined.value = value;
-         }
-      });
-   }
-
-}
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/RequestStatus.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/RequestStatus.java
deleted file mode 100644
index 3891c0d81..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/RequestStatus.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import org.eclipse.osee.ote.message.elements.IEnumValue;
-import org.eclipse.ote.bytemessage.EnumBase;
-import org.eclipse.ote.bytemessage.EnumSetter;
-
-public enum RequestStatus implements IEnumValue<RequestStatus> {
-	
-   yes(1),   no(2),
-
-   __undefined(-99999);
-
-   private int value;
-   
-   private RequestStatus(int value) {
-      this.value = value;
-   }
-   
-   public int getIntValue(){
-      return value;
-   }
-
-   @Override
-   public RequestStatus getEnum(int value) {
-      return base.toEnum(value);
-   }
-
-   public static RequestStatus toEnum(int value) {
-      return base.toEnum(value);
-   }
-   
-   public static RequestStatus[] valuesWithoutUndefined(int value) {
-      return base.getValues();
-   }
-   
-   private static EnumBase<RequestStatus> base;
-   static {
-      base = new EnumBase<RequestStatus>(values(), RequestStatus.class, __undefined, new EnumSetter() {
-         @Override
-         public void setValue(int value) {
-            __undefined.value = value;
-         }
-      });
-   }
-}
\ No newline at end of file
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationRequest.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationRequest.java
deleted file mode 100644
index c978860eb..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationRequest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.core.environment.BundleDescription;
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class ServerConfigurationRequest extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/configurationrequest";
-   
-   private static final int DEFAULT_BYTE_SIZE = 16;
-   
-   public ArrayElement UUID_DATA; 
-   public ArrayElement BUNDLE_DATA;
-
-   private BundleDescription[] bundles;
-   
-   public ServerConfigurationRequest(){
-      super(ServerConfigurationRequest.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      UUID_DATA = new ArrayElement(this, "UUID_DATA", getDefaultMessageData(), 0, 0, 127);
-      BUNDLE_DATA = new ArrayElement(this, "BUNDLE_DATA", getDefaultMessageData(), 16, 0, 0);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-
-   public void setBundleConfiguration(BundleDescription[] bundles) throws IOException {
-      byte[] bundleBytes = serializeObject(bundles);
-      setAndGrowData(bundleBytes, getHeaderSize() + BUNDLE_DATA.getByteOffset());
-   }
-   
-   public BundleDescription[] getBundleConfiguration() throws IOException, ClassNotFoundException{
-      if(bundles == null) { 
-         byte[] data = getDefaultMessageData().getMem().getData();
-         int offset = getHeaderSize() + BUNDLE_DATA.getByteOffset();
-         ObjectInputStream ois = unserializeObject(data, offset, data.length - offset);
-         Object obj = ois.readObject();
-         if(obj instanceof BundleDescription[]){
-            bundles = (BundleDescription[])obj;
-         }
-      }
-      return bundles;
-   }
-   
-}
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationResponse.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationResponse.java
deleted file mode 100644
index cd125baa5..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationResponse.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.osee.ote.message.elements.EnumeratedElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class ServerConfigurationResponse extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/configurationresponse";
-   
-   private static final int DEFAULT_BYTE_SIZE = 17;
-   
-   public ArrayElement UUID_DATA; 
-   public EnumeratedElement<RequestStatus> STATUS;
-
-   public ServerConfigurationResponse(){
-      super(ServerConfigurationResponse.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      getHeader().RESPONSE_TOPIC.setValue(ServerSessionResponse.TOPIC);
-      
-      UUID_DATA = new ArrayElement(this, "UUID_DATA", getDefaultMessageData(), 0, 0, 127);
-      STATUS = new EnumeratedElement<RequestStatus>(this, "STATUS", RequestStatus.class, getDefaultMessageData(), 16, 0, 7);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-
-}
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationStatus.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationStatus.java
deleted file mode 100644
index d8b85f101..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerConfigurationStatus.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.osee.ote.message.elements.EnumeratedElement;
-import org.eclipse.osee.ote.message.elements.IntegerElement;
-import org.eclipse.osee.ote.message.elements.StringElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class ServerConfigurationStatus extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/configurationstatus";
-   
-   private static final int DEFAULT_BYTE_SIZE = 21 + 256;
-   
-   public ArrayElement UUID_DATA; 
-   public EnumeratedElement<OpMode> STATUS;
-   public IntegerElement TOTAL_UNITS_OF_WORK;
-   public IntegerElement UNITS_WORKED_SO_FAR;
-   public StringElement MESSAGE;
-
-   public ServerConfigurationStatus(){
-      super(ServerConfigurationStatus.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      getHeader().RESPONSE_TOPIC.setValue(ServerSessionResponse.TOPIC);
-      
-      UUID_DATA = new ArrayElement(this, "UUID_DATA", getDefaultMessageData(), 0, 0, 127);
-      STATUS = new EnumeratedElement<OpMode>(this, "STATUS", OpMode.class, getDefaultMessageData(), 16, 0, 7);
-      TOTAL_UNITS_OF_WORK = new IntegerElement(this, "TOTAL_UNITS_OF_WORK", getDefaultMessageData(), 17, 0, 15);
-      UNITS_WORKED_SO_FAR = new IntegerElement(this, "UNITS_WORKED_SO_FAR", getDefaultMessageData(), 19, 0, 15);
-      MESSAGE = new StringElement(this, "MESSAGE", getDefaultMessageData(), 21, 0, 8*256 - 1);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-
-   public Object getOpMode() {
-      return STATUS.getValue();
-   }
-   
-}
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerSessionRequest.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerSessionRequest.java
deleted file mode 100644
index 37d75330d..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerSessionRequest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class ServerSessionRequest extends OteByteMessage {
-   
-   public static final String TOPIC = "ote/server/sessionrequest";
-   
-   private static final int DEFAULT_BYTE_SIZE = 16;
-   
-   public ArrayElement UUID_DATA; 
-
-   public ServerSessionRequest(){
-      super(ServerSessionRequest.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      getHeader().RESPONSE_TOPIC.setValue(ServerSessionResponse.TOPIC);
-      
-      UUID_DATA = new ArrayElement(this, "UUID_DATA", getDefaultMessageData(), 0, 0, 127);
-   }
-
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-}
diff --git a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerSessionResponse.java b/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerSessionResponse.java
deleted file mode 100644
index 510a6f5e0..000000000
--- a/org.eclipse.ote.connect.messages/src/org/eclipse/ote/connect/messages/ServerSessionResponse.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.messages;
-
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.eclipse.osee.ote.message.elements.ArrayElement;
-import org.eclipse.osee.ote.message.elements.EnumeratedElement;
-import org.eclipse.ote.bytemessage.OteByteMessage;
-
-
-public class ServerSessionResponse extends OteByteMessage {
-
-   public static final String TOPIC = "ote/server/sessionresponse";
-   
-   private static final int DEFAULT_BYTE_SIZE = 17;
-   
-   public ArrayElement UUID_DATA;
-   public EnumeratedElement<RequestStatus> STATUS;
-   
-   public ServerSessionResponse(){
-      super(ServerSessionResponse.class.getSimpleName(), TOPIC, 0, DEFAULT_BYTE_SIZE);
-      
-      UUID_DATA = new ArrayElement(this, "UUID_DATA", getDefaultMessageData(), 0, 0, 127);
-      STATUS = new EnumeratedElement<RequestStatus>(this, "STATUS", RequestStatus.class, getDefaultMessageData(), 16, 0, 7);
-   }
-   
-   public void setSessionUUID(UUID userSessionId) {
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      buffer.putLong(userSessionId.getMostSignificantBits());
-      buffer.putLong(userSessionId.getLeastSignificantBits());
-   }
-   
-   public UUID getSessionUUID(){
-      ByteBuffer buffer = UUID_DATA.asByteBuffer();
-      return new UUID(buffer.getLong(), buffer.getLong());
-   }
-}
diff --git a/org.eclipse.ote.connect.server.test/.classpath b/org.eclipse.ote.connect.server.test/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.connect.server.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.connect.server.test/.project b/org.eclipse.ote.connect.server.test/.project
deleted file mode 100644
index b75160077..000000000
--- a/org.eclipse.ote.connect.server.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.connect.server.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.connect.server.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.connect.server.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.connect.server.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.connect.server.test/META-INF/MANIFEST.MF b/org.eclipse.ote.connect.server.test/META-INF/MANIFEST.MF
deleted file mode 100644
index e0da63515..000000000
--- a/org.eclipse.ote.connect.server.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ote Connect Server Test (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.connect.server.test
-Bundle-Version: 0.11.0.qualifier
-Fragment-Host: org.eclipse.ote.connect.server;bundle-version="0.11.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit,
- org.eclipse.equinox.event;bundle-version="1.2.200"
-Import-Package: org.osgi.framework;version="1.7.0",
- org.osgi.service.packageadmin;version="1.2.0"
diff --git a/org.eclipse.ote.connect.server.test/build.properties b/org.eclipse.ote.connect.server.test/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/org.eclipse.ote.connect.server.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.eclipse.ote.connect.server.test/pom.xml b/org.eclipse.ote.connect.server.test/pom.xml
deleted file mode 100644
index 5bde8aef4..000000000
--- a/org.eclipse.ote.connect.server.test/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.connect.server.test</artifactId>
-	<packaging>eclipse-test-plugin</packaging>
-	<name>Eclipse OTE Connect Server Test (Incubation)</name>
- <!--
-   <build>
-     workaround for https://issues.sonatype.org/browse/TYCHO-168 
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/ConfigResponse.java b/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/ConfigResponse.java
deleted file mode 100644
index 4d3b3272c..000000000
--- a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/ConfigResponse.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.bytemessage.OteByteMessageResponseCallable;
-import org.eclipse.ote.connect.messages.ServerConfigurationResponse;
-
-public class ConfigResponse implements OteByteMessageResponseCallable<ServerConfigurationResponse> {
-
-   ServerConfigurationResponse received;
-   
-   @Override
-   public void call(ServerConfigurationResponse received) {
-      this.received = received;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/ConfigStatus.java b/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/ConfigStatus.java
deleted file mode 100644
index 6f118d5b2..000000000
--- a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/ConfigStatus.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.bytemessage.OteByteMessageResponseCallable;
-import org.eclipse.ote.connect.messages.ServerConfigurationStatus;
-
-public class ConfigStatus implements OteByteMessageResponseCallable<ServerConfigurationStatus> {
-
-   ServerConfigurationStatus received;
-   
-   @Override
-   public void call(ServerConfigurationStatus received) {
-      this.received = received;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/SessionResponse.java b/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/SessionResponse.java
deleted file mode 100644
index d7be2dc35..000000000
--- a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/SessionResponse.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.bytemessage.OteByteMessageResponseCallable;
-import org.eclipse.ote.connect.messages.ServerSessionResponse;
-
-public class SessionResponse implements  OteByteMessageResponseCallable<ServerSessionResponse>{
-
-   ServerSessionResponse received;
-
-   @Override
-   public void call(ServerSessionResponse received) {
-      this.received = received;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/SessionStateMachineTest.java b/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/SessionStateMachineTest.java
deleted file mode 100644
index 75d43c568..000000000
--- a/org.eclipse.ote.connect.server.test/src/org/eclipse/ote/connect/server/internal/SessionStateMachineTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import java.io.IOException;
-import java.util.UUID;
-
-import junit.framework.Assert;
-
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.connect.messages.RequestStatus;
-import org.eclipse.ote.connect.messages.ServerSessionRequest;
-import org.eclipse.ote.connect.messages.ServerSessionResponse;
-import org.eclipse.ote.services.core.ServiceUtility;
-import org.junit.Before;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.event.EventAdmin;
-
-public class SessionStateMachineTest {
-
-   @Before
-   public void setup(){
-      for(Bundle bundle:ServiceUtility.getContext().getBundles()){
-         try {
-            bundle.start();
-         } catch (BundleException e) {
-         }
-      }
-   }
-   
-   @Test
-   public void testStateTransitions() throws InterruptedException, IOException {
-
-      OteSendByteMessage sender = new OteSendByteMessage(ServiceUtility.getService(EventAdmin.class));
-      UUID id = UUID.randomUUID();
-      
-      SessionStateMachine stateMachine = new SessionStateMachine(null, ServiceUtility.getService(EventAdmin.class));
-      stateMachine.start();
-    
-      ServerSessionRequest request = new ServerSessionRequest();
-      request.setSessionUUID(id);
-      
-      Object obj = stateMachine.sm.getCurrentState();
-      Assert.assertEquals(StateAcceptSession.class, obj.getClass());
-
-      SessionResponse sessionResponse = new SessionResponse();
-      sender.asynchResponse(ServerSessionResponse.class, ServerSessionResponse.TOPIC, sessionResponse);
-      sender.asynchSend(request);
-      
-      Thread.sleep(500);
-      
-      Assert.assertNotNull(sessionResponse.received);
-      Assert.assertEquals(RequestStatus.no, sessionResponse.received.STATUS.getValue());
-      
-      Assert.assertEquals(StateAcceptSession.class, obj.getClass());
-   }
-   
-}
diff --git a/org.eclipse.ote.connect.server/.classpath b/org.eclipse.ote.connect.server/.classpath
deleted file mode 100644
index ad32c83a7..000000000
--- a/org.eclipse.ote.connect.server/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.ote.connect.server/.project b/org.eclipse.ote.connect.server/.project
deleted file mode 100644
index 4c2491792..000000000
--- a/org.eclipse.ote.connect.server/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ote.connect.server</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.ote.connect.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.ote.connect.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c537b6306..000000000
--- a/org.eclipse.ote.connect.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.ote.connect.server/META-INF/MANIFEST.MF b/org.eclipse.ote.connect.server/META-INF/MANIFEST.MF
deleted file mode 100644
index fdaec58fe..000000000
--- a/org.eclipse.ote.connect.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OTE Connect Server (Incubation)
-Bundle-SymbolicName: org.eclipse.ote.connect.server
-Bundle-Version: 0.11.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/*.xml
-Import-Package: org.eclipse.osee.framework.jdk.core.persistence,
- org.eclipse.osee.framework.logging,
- org.eclipse.osee.framework.messaging,
- org.eclipse.osee.ote.core,
- org.eclipse.osee.ote.core.environment,
- org.eclipse.osee.ote.core.environment.interfaces,
- org.eclipse.osee.ote.core.framework.prompt,
- org.eclipse.osee.ote.message.elements,
- org.eclipse.ote.bytemessage,
- org.eclipse.ote.connect.messages,
- org.eclipse.ote.services.core,
- org.eclipse.ote.statemachine,
- org.osgi.service.event;version="1.3.0"
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.ote.connect.server/OSGI-INF/ConnectAndConfigureComponent.xml b/org.eclipse.ote.connect.server/OSGI-INF/ConnectAndConfigureComponent.xml
deleted file mode 100644
index 57ba81858..000000000
--- a/org.eclipse.ote.connect.server/OSGI-INF/ConnectAndConfigureComponent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.ote.connect.server">
-   <implementation class="org.eclipse.ote.connect.server.ConnectAndConfigureComponent"/>
-   <reference bind="bindHostTestEnvironment" cardinality="1..1" interface="org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment" name="IHostTestEnvironment" policy="static" unbind="unbindHostTestEnvironment"/>
-   <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
-</scr:component>
diff --git a/org.eclipse.ote.connect.server/build.properties b/org.eclipse.ote.connect.server/build.properties
deleted file mode 100644
index 6210e849b..000000000
--- a/org.eclipse.ote.connect.server/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
-source.. = src/
diff --git a/org.eclipse.ote.connect.server/pom.xml b/org.eclipse.ote.connect.server/pom.xml
deleted file mode 100644
index 6ab87de25..000000000
--- a/org.eclipse.ote.connect.server/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ote</groupId>
-		<artifactId>org.eclipse.ote.parent</artifactId>
-		<version>0.11.0-SNAPSHOT</version>
-		<relativePath>../org.eclipse.ote.parent</relativePath>
-	</parent>
-
-	<artifactId>org.eclipse.ote.connect.server</artifactId>
-	<packaging>eclipse-plugin</packaging>
-	<name>Eclipse OTE Connect Server (Incubation)</name>
- <!--
-   <build>
-     workaround for https://issues.sonatype.org/browse/TYCHO-168 
-     <resources>
-      <resource>
-        <directory>src</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  -->
-</project>
\ No newline at end of file
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/ConnectAndConfigureComponent.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/ConnectAndConfigureComponent.java
deleted file mode 100644
index 1c6fe74c9..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/ConnectAndConfigureComponent.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server;
-
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
-import org.eclipse.ote.connect.server.internal.SessionStateMachine;
-import org.osgi.service.event.EventAdmin;
-
-public class ConnectAndConfigureComponent {
-   
-   private IHostTestEnvironment host;
-   private SessionStateMachine stateMachine;
-   private EventAdmin eventAdmin;
-
-   public void start(){
-      
-      stateMachine = new SessionStateMachine(host, eventAdmin);
-      
-      stateMachine.start();
-   }
-   
-   public void stop(){
-      if(stateMachine != null){
-         stateMachine.stop();
-      }
-   }
-   
-   public void bindHostTestEnvironment(IHostTestEnvironment host){
-      this.host = host;
-   }
-   
-   public void unbindHostTestEnvironment(IHostTestEnvironment host){
-      this.host = null;
-   }
-   
-   public void bindEventAdmin(EventAdmin eventAdmin){
-      this.eventAdmin = eventAdmin;
-   }
-   
-   public void unbindEventAdmin(EventAdmin eventAdmin){
-      this.eventAdmin = null;
-   }
-   
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/FakeUserSession.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/FakeUserSession.java
deleted file mode 100644
index cf716cfc3..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/FakeUserSession.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.eclipse.ote.connect.server.internal;
-
-import java.rmi.RemoteException;
-import java.util.UUID;
-
-import org.eclipse.osee.framework.messaging.Message;
-import org.eclipse.osee.ote.core.IRemoteUserSession;
-import org.eclipse.osee.ote.core.OSEEPerson1_4;
-import org.eclipse.osee.ote.core.framework.prompt.IPassFailPromptResponse;
-import org.eclipse.osee.ote.core.framework.prompt.IResumeResponse;
-import org.eclipse.osee.ote.core.framework.prompt.IUserInputPromptResponse;
-import org.eclipse.osee.ote.core.framework.prompt.IYesNoPromptResponse;
-
-public class FakeUserSession implements IRemoteUserSession {
-
-   @Override
-   public void initiateYesNoPrompt(IYesNoPromptResponse prompt) throws Exception {
-      // TODO Auto-generated method stub
-      System.out.println("initiateYesNoPrompt");
-   }
-
-   @Override
-   public void cancelPrompts() throws Exception {
-      // TODO Auto-generated method stub
-      System.out.println("cancelPrompts");
-   }
-
-   @Override
-   public String getAddress() throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("getAddress");
-      return "127.0.0.1";
-   }
-
-   @Override
-   public OSEEPerson1_4 getUser() throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("getUser");
-      return new OSEEPerson1_4("na", "na", "na");
-   }
-
-   @Override
-   public byte[] getFile(String workspacePath) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("getFile");
-      return new byte[0];
-   }
-
-   @Override
-   public long getFileDate(String workspacePath) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("getFileDate");
-      return 0;
-   }
-
-   @Override
-   public void initiatePassFailPrompt(IPassFailPromptResponse prompt) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("initiatePassFailPrompt");
-   }
-
-   @Override
-   public void initiateUserInputPrompt(IUserInputPromptResponse prompt) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("initiateUserInputPrompt");
-   }
-
-   @Override
-   public void initiateResumePrompt(IResumeResponse prompt) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("initiateResumePrompt");
-   }
-
-   @Override
-   public void initiateInformationalPrompt(String message) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("initiateInformationalPrompt");
-   }
-
-   @Override
-   public boolean isAlive() throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("isAlive");
-      return false;
-   }
-
-   @Override
-   public void sendMessageToClient(Message message) throws RemoteException {
-      // TODO Auto-generated method stub
-      System.out.println("sendMessageToClient");
-   }
-
-   @Override
-   public UUID getUserId() throws Exception {
-      // TODO Auto-generated method stub
-      System.out.println("get id");
-      return UUID.randomUUID();
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputAcceptingUpdatedConfiguration.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputAcceptingUpdatedConfiguration.java
deleted file mode 100644
index 39ba4d8cd..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputAcceptingUpdatedConfiguration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputAcceptingUpdatedConfiguration extends BaseInput {
-
-   public static final Object TYPE = new Object();
-   
-   public InputAcceptingUpdatedConfiguration(StateMachine stateMachine) {
-      super(stateMachine);
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputAllowMoreSessions.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputAllowMoreSessions.java
deleted file mode 100644
index e2e6e2386..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputAllowMoreSessions.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputAllowMoreSessions extends BaseInput {
-
-   public static final Object TYPE = new Object();
-   
-   public InputAllowMoreSessions(StateMachine stateMachine) {
-      super(stateMachine);
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputNoMoreSessions.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputNoMoreSessions.java
deleted file mode 100644
index 059ba738d..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputNoMoreSessions.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputNoMoreSessions extends BaseInput {
-
-   public static final Object TYPE = new Object();
-   
-   public InputNoMoreSessions(StateMachine sm) {
-      super(sm);
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputServerSessionRequest.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputServerSessionRequest.java
deleted file mode 100644
index 2b674095a..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/InputServerSessionRequest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.connect.messages.ServerSessionRequest;
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class InputServerSessionRequest extends BaseInput{
-
-   public static final Object TYPE = new Object();
-   private ServerSessionRequest request;
-   
-   public InputServerSessionRequest(StateMachine stateMachine) {
-      super(stateMachine);
-   }
-
-   @Override
-   public Object getType() {
-      return TYPE;
-   }
-   
-   public void set(ServerSessionRequest request){
-      this.request = request;
-   }
-   
-   public ServerSessionRequest get(){
-      return request;
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/ServerSessionRequestHandler.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/ServerSessionRequestHandler.java
deleted file mode 100644
index b412b6e08..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/ServerSessionRequestHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.bytemessage.OteByteMessageResponseCallable;
-import org.eclipse.ote.connect.messages.ServerSessionRequest;
-
-public class ServerSessionRequestHandler implements OteByteMessageResponseCallable<ServerSessionRequest> {
-
-   private InputServerSessionRequest inputServerSesisonRequest;
-
-   public ServerSessionRequestHandler(InputServerSessionRequest inputServerSesisonRequest){
-      this.inputServerSesisonRequest = inputServerSesisonRequest;
-   }
-   
-   public void timeout(){
-      
-   }
-   
-   public void call(ServerSessionRequest received){
-      inputServerSesisonRequest.set(received);
-      inputServerSesisonRequest.addToStateMachineQueue();
-   }
-   
- }
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/ServerSideRemoteUserSession.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/ServerSideRemoteUserSession.java
deleted file mode 100644
index d63cfb660..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/ServerSideRemoteUserSession.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.eclipse.ote.connect.server.internal;
-
-import java.rmi.RemoteException;
-import java.util.UUID;
-
-import org.eclipse.osee.framework.messaging.Message;
-import org.eclipse.osee.ote.core.IRemoteUserSession;
-import org.eclipse.osee.ote.core.OSEEPerson1_4;
-import org.eclipse.osee.ote.core.framework.prompt.IPassFailPromptResponse;
-import org.eclipse.osee.ote.core.framework.prompt.IResumeResponse;
-import org.eclipse.osee.ote.core.framework.prompt.IUserInputPromptResponse;
-import org.eclipse.osee.ote.core.framework.prompt.IYesNoPromptResponse;
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-
-public class ServerSideRemoteUserSession implements IRemoteUserSession {
-
-   public ServerSideRemoteUserSession(UUID sessionUUID, OteSendByteMessage sender) {
-      
-   }
-
-   @Override
-   public void initiateYesNoPrompt(IYesNoPromptResponse prompt) throws Exception {
-      System.out.println("ServerSideRemoteUserSession initiateYesNoPrompt " + prompt.getPromptMessage());
-   }
-
-   @Override
-   public void cancelPrompts() throws Exception {
-      System.out.println("ServerSideRemoteUserSession cancelPrompts");
-   }
-
-   @Override
-   public String getAddress() throws RemoteException {
-      return "ServerSideRemoteUserSession mine";
-   }
-
-   @Override
-   public OSEEPerson1_4 getUser() throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession getUser");
-      return new OSEEPerson1_4("na", "na", "na");
-   }
-
-   @Override
-   public byte[] getFile(String workspacePath) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession getFile" + workspacePath);
-      return null;
-   }
-
-   @Override
-   public long getFileDate(String workspacePath) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession getFileDate" + workspacePath);
-      return 0;
-   }
-
-   @Override
-   public void initiatePassFailPrompt(IPassFailPromptResponse prompt) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession initiatePassFailPrompt " + prompt.toString());
-   }
-
-   @Override
-   public void initiateUserInputPrompt(IUserInputPromptResponse prompt) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession initiateUserInputPrompt " + prompt.toString());
-   }
-
-   @Override
-   public void initiateResumePrompt(IResumeResponse prompt) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession initiateResumePrompt " + prompt.toString());
-   }
-
-   @Override
-   public void initiateInformationalPrompt(String message) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession initiateInformationalPrompt " + message.toString());
-   }
-
-   @Override
-   public boolean isAlive() throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession isAlive ");
-      return true;
-   }
-
-   @Override
-   public void sendMessageToClient(Message message) throws RemoteException {
-      System.out.println("ServerSideRemoteUserSession sendMessageToClient " + message.toString());
-   }
-
-   @Override
-   public UUID getUserId() throws Exception {
-      System.out.println("ServerSideRemoteUserSession getUserId");
-      return UUID.randomUUID();
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/SessionStateMachine.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/SessionStateMachine.java
deleted file mode 100644
index f9fc7865a..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/SessionStateMachine.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
-import org.eclipse.ote.bytemessage.OteByteMessageResponseFuture;
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.connect.messages.ServerSessionRequest;
-import org.eclipse.ote.statemachine.StateMachine;
-import org.osgi.service.event.EventAdmin;
-
-public class SessionStateMachine {
-   StateMachine sm;
-   private OteByteMessageResponseFuture<ServerSessionRequest> serverSessionRequestFuture;
-   private IHostTestEnvironment host;
-   private EventAdmin eventAdmin;
-
-   
-   public SessionStateMachine(IHostTestEnvironment host, EventAdmin eventAdmin){
-      this.host = host;
-      this.eventAdmin = eventAdmin;
-   }
-   
-   public void start(){
-      try{
-         sm = new StateMachine("SessionStateMachine");
-
-         OteSendByteMessage sender = new OteSendByteMessage(eventAdmin);
-         
-         InputServerSessionRequest inputServerSesisonRequest = new InputServerSessionRequest(sm);
-         InputNoMoreSessions inputNoMoreSessions = new InputNoMoreSessions(sm);
-         InputAllowMoreSessions inputAllowMoreSessions = new InputAllowMoreSessions(sm);
-         
-         serverSessionRequestFuture = 
-               sender.asynchResponse(ServerSessionRequest.class, ServerSessionRequest.TOPIC, new ServerSessionRequestHandler(inputServerSesisonRequest));
-         
-         StateAcceptSession stateAcceptSession = new StateAcceptSession(sm, sender, host);
-         StateRejectSession stateRejectSession = new StateRejectSession(sender);
-
-         sm.setDefaultInitialState(stateAcceptSession);
-         sm.newTransition(stateAcceptSession, inputServerSesisonRequest, stateAcceptSession);
-         sm.newTransition(stateAcceptSession, inputNoMoreSessions, stateRejectSession);
-         sm.newTransition(stateRejectSession, inputAllowMoreSessions, stateAcceptSession);
-         
-         sm.initialize();
-         
-         sm.start();
-      } catch (Exception ex){
-         OseeLog.log(getClass(), Level.SEVERE, ex);
-      }
-   }
-   
-   public void stop(){
-      if(serverSessionRequestFuture != null){
-         serverSessionRequestFuture.cancel();
-      }
-   }
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/StateAcceptSession.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/StateAcceptSession.java
deleted file mode 100644
index c3500286e..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/StateAcceptSession.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import java.util.logging.Level;
-
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.ote.core.environment.interfaces.IHostTestEnvironment;
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.connect.messages.RequestStatus;
-import org.eclipse.ote.connect.messages.ServerSessionRequest;
-import org.eclipse.ote.connect.messages.ServerSessionResponse;
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.BaseState;
-import org.eclipse.ote.statemachine.StateMachine;
-
-public class StateAcceptSession extends BaseState {
-
-   private OteSendByteMessage sender;
-   private IHostTestEnvironment host;
-
-   public StateAcceptSession(StateMachine sm, OteSendByteMessage sender, IHostTestEnvironment host) throws Exception {
-      this.sender = sender;
-      this.host = host;
-   }
-
-   @Override
-   public void run(BaseInput input) {
-      if(InputServerSessionRequest.TYPE == input.getType()){
-         InputServerSessionRequest inputServerSessionRequest = (InputServerSessionRequest)input;
-         ServerSessionRequest request = inputServerSessionRequest.get();
-         ServerSessionResponse response = new ServerSessionResponse();
-         response.setSessionUUID(request.getSessionUUID());
-         response.STATUS.setValue(RequestStatus.yes);
-         try{
-            host.requestEnvironment(new ServerSideRemoteUserSession(request.getSessionUUID(), sender), request.getSessionUUID(), null);
-         } catch (Throwable ex){
-            response.STATUS.setValue(RequestStatus.no);
-            OseeLog.log(getClass(), Level.SEVERE, "Failed to start test environment", ex);
-         }
-         sender.asynchSend(response);
-      }
-   }
-
-   @Override
-   public void entry() {
-   }
-
-}
diff --git a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/StateRejectSession.java b/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/StateRejectSession.java
deleted file mode 100644
index ac69a41ba..000000000
--- a/org.eclipse.ote.connect.server/src/org/eclipse/ote/connect/server/internal/StateRejectSession.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * 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:
- *     Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ote.connect.server.internal;
-
-import org.eclipse.ote.bytemessage.OteSendByteMessage;
-import org.eclipse.ote.connect.messages.RequestStatus;
-import org.eclipse.ote.connect.messages.ServerSessionRequest;
-import org.eclipse.ote.connect.messages.ServerSessionResponse;
-import org.eclipse.ote.statemachine.BaseInput;
-import org.eclipse.ote.statemachine.BaseState;
-
-public class StateRejectSession extends BaseState {
-
-   private OteSendByteMessage sender;
-
-   public StateRejectSession(OteSendByteMessage sender){
-      this.sender = sender;
-   }
-   
-   @Override
-   public void run(BaseInput input) {
-      if(InputServerSessionRequest.TYPE == input.getType()){
-         InputServerSessionRequest inputServerSessionRequest = (InputServerSessionRequest)input;
-         ServerSessionRequest request = inputServerSessionRequest.get();
-         ServerSessionResponse response = new ServerSessionResponse();
-         response.setSessionUUID(request.getSessionUUID());
-         response.STATUS.setValue(RequestStatus.no);
-         sender.asynchSend(response);
-      }
-   }
-
-   @Override
-   public void entry() {
-   }
-
-}
diff --git a/org.eclipse.ote.parent/pom.xml b/org.eclipse.ote.parent/pom.xml
index f7e08973f..b7c3404f8 100644
--- a/org.eclipse.ote.parent/pom.xml
+++ b/org.eclipse.ote.parent/pom.xml
@@ -18,12 +18,6 @@
 	<modules>
 	   <module>../org.eclipse.ote.bytemessage</module>
 	   <module>../org.eclipse.ote.bytemessage.test</module>
-	   <module>../org.eclipse.ote.commands.messages</module>
-	   <module>../org.eclipse.ote.commands.server</module>
-	   <module>../org.eclipse.ote.connect.messages</module>
-	   <module>../org.eclipse.ote.connect.messages.test</module>
-	   <module>../org.eclipse.ote.connect.server</module>
-	   <module>../org.eclipse.ote.connect.server.test</module>
 	   <module>../org.eclipse.ote.event.bridge.jms</module>
 		<module>../org.eclipse.ote.io</module>
 		<module>../org.eclipse.ote.io.test</module>
diff --git a/org.eclipse.ote.server.feature/feature.xml b/org.eclipse.ote.server.feature/feature.xml
index ce9cccc38..1c5ef856a 100644
--- a/org.eclipse.ote.server.feature/feature.xml
+++ b/org.eclipse.ote.server.feature/feature.xml
@@ -16,18 +16,4 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="org.eclipse.ote.connect.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ote.commands.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.ote.serverclient.feature/feature.xml b/org.eclipse.ote.serverclient.feature/feature.xml
index 2d3f7e57e..8fc56dee0 100644
--- a/org.eclipse.ote.serverclient.feature/feature.xml
+++ b/org.eclipse.ote.serverclient.feature/feature.xml
@@ -31,13 +31,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ote.connect.messages"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.ote.event.bridge.jms"
          download-size="0"
          install-size="0"
@@ -66,13 +59,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ote.commands.messages"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.ote.io"
          download-size="0"
          install-size="0"