diff --git a/de.ugoe.cs.swe.T3Q/build/t3q.xml b/de.ugoe.cs.swe.T3Q/build/t3q.xml
index 596382a092a6b3be40a8beb11fcce5345a231b9c..b8db7ee61f81b91a41ed6134177c533cf55008af 100644
--- a/de.ugoe.cs.swe.T3Q/build/t3q.xml
+++ b/de.ugoe.cs.swe.T3Q/build/t3q.xml
@@ -2,7 +2,7 @@
   <ConfigurationProfiles>
     <QualityCheckProfile>
       <profileName>stf160Profile</profileName>
-      <profileVersion>v2.1.0b5</profileVersion>
+      <profileVersion>v2.1.1</profileVersion>
       <!--  <resourceExtensionsRegExp>ttcn|ttcn3|3mp</resourceExtensionsRegExp> -->
       <!--    <projectExtension>t3p</projectExtension> -->
       <!-- added pattern for files generated from ASN.1 -->
@@ -149,7 +149,7 @@
     </QualityCheckProfile>
     <QualityCheckProfile>
       <profileName>defaultProfile</profileName>
-      <profileVersion>v2.1.0b5</profileVersion>
+      <profileVersion>v2.1.1</profileVersion>
       <ignoredResourceRegExp>(.*asn[.]json[.].*ttcn)|(.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)</ignoredResourceRegExp>
       <settingAbortOnError>true</settingAbortOnError>
       <loggingConfiguration>
@@ -273,7 +273,7 @@
     </QualityCheckProfile>
     <QualityCheckProfile>
       <profileName>nothing</profileName>
-      <profileVersion>v2.1.0b5</profileVersion>
+      <profileVersion>v2.1.1</profileVersion>
       <ignoredResourceRegExp>(.*asn[.]json[.].*ttcn)|(.*[/\\]Common[/\\](IMS_LibSip|IMS_XSD)[/\\].*[.]ttcn)</ignoredResourceRegExp>
       <settingAbortOnError>true</settingAbortOnError>
       <loggingConfiguration>
diff --git a/de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java b/de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java
index 473bdec1c95638faccb51652cb46474bb48a9f04..2f336c596b6ae00c9c028d92f754cbe6a24e5aa6 100644
--- a/de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java
+++ b/de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/T3Q.java
@@ -42,7 +42,7 @@ import de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider;
 
 public class T3Q {
 	//TODO: externalise meta-data
-	private static String versionNumber = "v2.1.0b5";
+	private static String versionNumber = "v2.1.1";
 	private static String supportedTTCN3Version = "4.10.1";
 	// set during automated server builds -> no longer displayed or used..
 	private static String buildStamp = "---BUILD_STAMP---";
diff --git a/de.ugoe.cs.swe.TTCN3Configuration/META-INF/MANIFEST.MF b/de.ugoe.cs.swe.TTCN3Configuration/META-INF/MANIFEST.MF
index dcb241a59eeae6590cf75a86e68d0a17d6fcbc74..7d8ad02666f2802d0fc713ee510347e56b03471d 100644
--- a/de.ugoe.cs.swe.TTCN3Configuration/META-INF/MANIFEST.MF
+++ b/de.ugoe.cs.swe.TTCN3Configuration/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: T3Tools Configuration
 Bundle-SymbolicName: de.ugoe.cs.swe.TTCN3Configuration
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.apache.commons.cli,
- de.ugoe.cs.swe.TTCN3.external,
  org.eclipse.emf.common,
  jakarta.xml.bind-api,
  com.sun.xml.bind.jaxb-core,
diff --git a/de.ugoe.cs.swe.TTCN3Configuration/src/de/ugoe/cs/swe/common/ConfigTools.java b/de.ugoe.cs.swe.TTCN3Configuration/src/de/ugoe/cs/swe/common/ConfigTools.java
index 72122bf3aba1575c508cea2e2aed6fd09fce9bd2..381bd049c9297f9c0a4c70128b5654c8b5203107 100644
--- a/de.ugoe.cs.swe.TTCN3Configuration/src/de/ugoe/cs/swe/common/ConfigTools.java
+++ b/de.ugoe.cs.swe.TTCN3Configuration/src/de/ugoe/cs/swe/common/ConfigTools.java
@@ -2,15 +2,9 @@ package de.ugoe.cs.swe.common;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.ConversionException;
-
 import de.ugoe.cs.swe.TTCN3Configuration.NamingConventionsConfig;
 import de.ugoe.cs.swe.TTCN3Configuration.QualityCheckProfile;
 import de.ugoe.cs.swe.TTCN3Configuration.T3QConfig;
@@ -109,39 +103,6 @@ public class ConfigTools {
 		return config;
 	}
 
-	private ToolConfiguration readConfigXstream(String filename) throws TerminationException {
-		System.out.println("  Reading XML configuration from: " + filename);
-		String str = MiscTools.readFile(filename);
-		XStream xstream = new XStream();
-		initXstreamAliases(xstream);
-		ToolConfiguration config = null;
-		try {
-			config = (ToolConfiguration) xstream.fromXML(str);
-		} catch (ConversionException ce) {
-			String line = "";
-			line = ce.getMessage().split("line\\snumber[\\t\\s]+?:\\s")[1];
-			line = line.substring(0, line.indexOf("\n"));
-			System.out.println("  Problem Occured while loading configuration: line: " + line);
-			// TODO: add further debugging details?
-		}
-		return config;
-	}
-
-	private void initXstreamAliases(XStream xstream) throws TerminationException {
-//		XStream.setupDefaultSecurity(xstream); // to be removed after 1.5
-		xstream.allowTypesByWildcard(new String[] {
-		    "de.ugoe.cs.swe.TTCN3Configuration.**"
-		});
-		
-		try {
-			xstream.alias(Class.forName(configurationClassName).getSimpleName(), Class.forName(configurationClassName));
-			xstream.alias(Class.forName(configurationProfileClassName).getSimpleName(), Class.forName(configurationProfileClassName));
-		} catch (ClassNotFoundException e) {
-			System.out.println("  Problem occurred while initiating XStream. Class not found: " + e.getMessage());
-			throw new TerminationException("Class not found: " + e.getMessage());
-		}
-	}
-
 	private void writeConfig(ToolConfiguration config, String filename) throws TerminationException {
 		System.out.println("  Writing XML configuration to: " + filename);
 		try {
@@ -155,27 +116,6 @@ public class ConfigTools {
 		}
 	}
 
-	private void writeConfigXstream(ToolConfiguration config, String filename) throws TerminationException {
-		System.out.println("  Writing XML configuration to: " + filename);
-		XStream xstream = new XStream();
-		initXstreamAliases(xstream);
-		String xml = xstream.toXML(config);
-		OutputStreamWriter oos;
-		// write out an empty file
-		MiscTools.writeFile(filename, "");
-		try {
-			oos = new OutputStreamWriter(new FileOutputStream(filename));
-			oos.write(xml);
-			oos.close();
-		} catch (FileNotFoundException e) {
-			System.out.println("  ERROR: File could not be found! (\"" + filename + "\")");
-			throw new TerminationException(e.getMessage());
-		} catch (IOException e) {
-			System.out.println("  IO ERROR: Could not write to file! (\"" + filename + "\")");
-			throw new TerminationException(e.getMessage());
-		}
-	}
-
 	public ConfigurationProfile selectProfile(String specifiedProfileName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
 		// add all default implicit profile
 		ConfigurationProfile selectedProfile = null;