diff --git a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
index 5588da0faae84ac648c86ceb8a2ebf1ee9b179c9..357f2374a61f8a7f44adac592eca79328ee6c9e8 100644
--- a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
+++ b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/model/tm/TestInstance.java
@@ -14,8 +14,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import org.hibernate.annotations.Fetch;
-
 @Entity
 @Table(name = "tm_testInstance", schema = "public")
 @XmlAccessorType(XmlAccessType.NONE)
diff --git a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
index c37f9d5b81752e7e5f03bbf9f89de38205452370..c8660f24be8ba88aeb5ff05ff6097f20cc5e21e2 100644
--- a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
+++ b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/IProxyForTM.java
@@ -1,8 +1,11 @@
 package net.ihe.gazelle.proxy.ws;
 
+import java.util.List;
+
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 
+import net.ihe.gazelle.proxy.model.tm.Configuration;
 import net.ihe.gazelle.proxy.model.tm.TestInstance;
 
 @WebService
@@ -14,4 +17,7 @@ public interface IProxyForTM {
 	@WebMethod
 	void markTestStep(int testStepId);
 
+	@WebMethod
+	void startAllChannels(List<Configuration> configurations);
+
 }
diff --git a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
index 8265ac93e6b9d8987a26e4e103f0a20651f9b48c..caa2047a9aa2faa5b97de71d156562f968c7cb37 100644
--- a/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
+++ b/gazelle-proxy-ejb/src/main/java/net/ihe/gazelle/proxy/ws/ProxyForTM.java
@@ -30,6 +30,15 @@ public class ProxyForTM implements IProxyForTM {
 		super();
 	}
 
+	public void startAllChannels(List<Configuration> configurations) {
+		for (Configuration configuration : configurations) {
+			configuration.setTestInstance(null);
+			if (configuration.getProxyPort() > 0) {
+				startChannel(configuration);
+			}
+		}
+	}
+
 	@WebMethod
 	public void startTestInstance(TestInstance testInstance) {
 		Calendar endTI = Calendar.getInstance();
diff --git a/gazelle-proxy-ws/pom.xml b/gazelle-proxy-ws/pom.xml
index becec2fb75ff73b89d23bd330120e20f83b0e258..b3a17c79216e2032a439cbd24ae5c49f39b68772 100644
--- a/gazelle-proxy-ws/pom.xml
+++ b/gazelle-proxy-ws/pom.xml
@@ -34,18 +34,6 @@
 							<genWsdl>true</genWsdl>
 						</configuration>
 					</execution>
-					<!-- <execution> -->
-					<!-- <id>genJava</id> -->
-					<!-- <phase>generate-sources</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>wsimport</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <packageName>net.ihe.gazelle.proxy.ws.client</packageName> -->
-					<!-- <wsdlDirectory>${basedir}/target/jaxws/wsgen/wsdl</wsdlDirectory> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-
 				</executions>
 
 				<dependencies>