diff --git a/hsarback/conf/WEB-INF/dev-web.xml b/hsarback/conf/WEB-INF/dev-web.xml
index 34ee706..18aed7a 100644
--- a/hsarback/conf/WEB-INF/dev-web.xml
+++ b/hsarback/conf/WEB-INF/dev-web.xml
@@ -14,112 +14,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-  	<servlet>
-  		<servlet-name>CLI Client Connector</servlet-name>
-	  	<servlet-class>de.hsadmin.cliClientConnector.CLIClientConnectorServlet</servlet-class>
-  		<init-param>
-	  		<param-name>proxyValidateUrl</param-name>
-		  	<param-value>TestUmgebung</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>proxyServiceUrl</param-name>
-		  	<param-value>TestUmgebung</param-value>
-  		</init-param>
-	  	<init-param>
-  			<param-name>Components</param-name>
-	  		<param-value>member,pac,user,domain,emailaddress,emailalias,mysqluser,mysqldb,postgresqluser,postgresqldb,q</param-value>
-		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_member</param-name>
-			<param-value>de.hsadmin.mods.cust.Customer</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_member</param-name>
-		  	<param-value>Mitglieder</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_pac</param-name>
-			<param-value>de.hsadmin.mods.pac.Pac</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_pac</param-name>
-		  	<param-value>Pakete</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentClass_user</param-name>
-		  	<param-value>de.hsadmin.mods.user.UnixUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_user</param-name>
-		  	<param-value>Benutzer und Postfaecher anlegen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_domain</param-name>
-			<param-value>de.hsadmin.mods.dom.Domain</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_domain</param-name>
-		  	<param-value>Domains aufschalten</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailaddress</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAddress</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailaddress</param-name>
-		  	<param-value>E-Mail Adressen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailalias</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAlias</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailalias</param-name>
-		  	<param-value>E-Mail Aliases</param-value>  
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_postgresqluser</param-name>
-			<param-value>de.hsadmin.mods.db.PgSqlUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_postgresqluser</param-name>
-		  	<param-value>PostgreSQL DB-Administrator</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_postgresqldb</param-name>
-			<param-value>de.hsadmin.mods.db.PgSqlDatabase</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_postgresqldb</param-name>
-		  	<param-value>PostgreSQL Datenbank</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_mysqluser</param-name>
-			<param-value>de.hsadmin.mods.db.MySqlUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_mysqluser</param-name>
-		  	<param-value>MySQL DB-Administrator</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_mysqldb</param-name>
-			<param-value>de.hsadmin.mods.db.MySqlDatabase</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_mysqldb</param-name>
-		  	<param-value>MySQL Datenbank</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_q</param-name>
-			<param-value>de.hsadmin.core.qserv.QueueTask</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_q</param-name>
-		  	<param-value>Offene Aktionen</param-value>
-  		</init-param>
-        <load-on-startup>1</load-on-startup>
-  	</servlet>
-
    <servlet>
         <servlet-name>XmlRpcServlet</servlet-name>
         <servlet-class>de.hsadmin.remote.HSXmlRpcServlet</servlet-class>
diff --git a/hsarback/conf/WEB-INF/prod-web.xml b/hsarback/conf/WEB-INF/prod-web.xml
index 9b19bac..1b71c01 100644
--- a/hsarback/conf/WEB-INF/prod-web.xml
+++ b/hsarback/conf/WEB-INF/prod-web.xml
@@ -14,112 +14,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-  	<servlet>
-  		<servlet-name>CLI Client Connector</servlet-name>
-	  	<servlet-class>de.hsadmin.cliClientConnector.CLIClientConnectorServlet</servlet-class>
-  		<init-param>
-	  		<param-name>proxyValidateUrl</param-name>
-		  	<param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>proxyServiceUrl</param-name>
-		  	<param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
-  		</init-param>
-	  	<init-param>
-  			<param-name>Components</param-name>
-	  		<param-value>member,pac,user,domain,emailaddress,emailalias,mysqluser,mysqldb,postgresqluser,postgresqldb,q</param-value>
-		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_member</param-name>
-			<param-value>de.hsadmin.mods.cust.Customer</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_member</param-name>
-		  	<param-value>Mitglieder</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_pac</param-name>
-			<param-value>de.hsadmin.mods.pac.Pac</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_pac</param-name>
-		  	<param-value>Pakete</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentClass_user</param-name>
-		  	<param-value>de.hsadmin.mods.user.UnixUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_user</param-name>
-		  	<param-value>Benutzer und Postfaecher anlegen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_domain</param-name>
-			<param-value>de.hsadmin.mods.dom.Domain</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_domain</param-name>
-		  	<param-value>Domains aufschalten</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailaddress</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAddress</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailaddress</param-name>
-		  	<param-value>E-Mail Adressen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailalias</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAlias</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailalias</param-name>
-		  	<param-value>E-Mail Aliases</param-value>  
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_postgresqluser</param-name>
-			<param-value>de.hsadmin.mods.db.PgSqlUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_postgresqluser</param-name>
-		  	<param-value>PostgreSQL DB-Administrator</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_postgresqldb</param-name>
-			<param-value>de.hsadmin.mods.db.PgSqlDatabase</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_postgresqldb</param-name>
-		  	<param-value>PostgreSQL Datenbank</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_mysqluser</param-name>
-			<param-value>de.hsadmin.mods.db.MySqlUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_mysqluser</param-name>
-		  	<param-value>MySQL DB-Administrator</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_mysqldb</param-name>
-			<param-value>de.hsadmin.mods.db.MySqlDatabase</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_mysqldb</param-name>
-		  	<param-value>MySQL Datenbank</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_q</param-name>
-			<param-value>de.hsadmin.core.qserv.QueueTask</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_q</param-name>
-		  	<param-value>Offene Aktionen</param-value>
-  		</init-param>
-        <load-on-startup>1</load-on-startup>
-  	</servlet>
-
    <servlet>
         <servlet-name>XmlRpcServlet</servlet-name>
         <servlet-class>de.hsadmin.remote.HSXmlRpcServlet</servlet-class>
diff --git a/hsarback/conf/WEB-INF/test-web.xml b/hsarback/conf/WEB-INF/test-web.xml
index 4f7bf97..df5a9df 100644
--- a/hsarback/conf/WEB-INF/test-web.xml
+++ b/hsarback/conf/WEB-INF/test-web.xml
@@ -14,112 +14,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-  	<servlet>
-  		<servlet-name>CLI Client Connector</servlet-name>
-	  	<servlet-class>de.hsadmin.cliClientConnector.CLIClientConnectorServlet</servlet-class>
-  		<init-param>
-	  		<param-name>proxyValidateUrl</param-name>
-		  	<param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>proxyServiceUrl</param-name>
-		  	<param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
-  		</init-param>
-	  	<init-param>
-  			<param-name>Components</param-name>
-	  		<param-value>member,pac,user,domain,emailaddress,emailalias,mysqluser,mysqldb,postgresqluser,postgresqldb,q</param-value>
-		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_member</param-name>
-			<param-value>de.hsadmin.mods.cust.Customer</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_member</param-name>
-		  	<param-value>Mitglieder</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_pac</param-name>
-			<param-value>de.hsadmin.mods.pac.Pac</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_pac</param-name>
-		  	<param-value>Pakete</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentClass_user</param-name>
-		  	<param-value>de.hsadmin.mods.user.UnixUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_user</param-name>
-		  	<param-value>Benutzer und Postfaecher anlegen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_domain</param-name>
-			<param-value>de.hsadmin.mods.dom.Domain</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_domain</param-name>
-		  	<param-value>Domains aufschalten</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailaddress</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAddress</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailaddress</param-name>
-		  	<param-value>E-Mail Adressen</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_emailalias</param-name>
-			<param-value>de.hsadmin.mods.email.EMailAlias</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_emailalias</param-name>
-		  	<param-value>E-Mail Aliases</param-value>  
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_postgresqluser</param-name>
-			<param-value>de.hsadmin.mods.db.PgSqlUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_postgresqluser</param-name>
-		  	<param-value>PostgreSQL DB-Administrator</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_postgresqldb</param-name>
-			<param-value>de.hsadmin.mods.db.PgSqlDatabase</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_postgresqldb</param-name>
-		  	<param-value>PostgreSQL Datenbank</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_mysqluser</param-name>
-			<param-value>de.hsadmin.mods.db.MySqlUser</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_mysqluser</param-name>
-		  	<param-value>MySQL DB-Administrator</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_mysqldb</param-name>
-			<param-value>de.hsadmin.mods.db.MySqlDatabase</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_mysqldb</param-name>
-		  	<param-value>MySQL Datenbank</param-value>
-  		</init-param>
-	  	<init-param>
-		  	<param-name>ComponentClass_q</param-name>
-			<param-value>de.hsadmin.core.qserv.QueueTask</param-value>
-  		</init-param>
-  		<init-param>
-	  		<param-name>ComponentDescription_q</param-name>
-		  	<param-value>Offene Aktionen</param-value>
-  		</init-param>
-        <load-on-startup>1</load-on-startup>
-  	</servlet>
-
    <servlet>
         <servlet-name>XmlRpcServlet</servlet-name>
         <servlet-class>de.hsadmin.remote.HSXmlRpcServlet</servlet-class>