diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 54c392912707d2912cd221b63dd348adc87111f0..8dc7401d439359d3eba97bd625ccb896aab271ab 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -582,6 +582,15 @@ namespace TUGraz.VectoCommon.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ChassisConfiguration.
+        /// </summary>
+        public static string Bus_ChassisConfiguration {
+            get {
+                return ResourceManager.GetString("Bus_ChassisConfiguration", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to CompressorRatio.
         /// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 0f4f5265577b42bce12a8c80031caa0fbf339727..17b740e0859d86e3140ccd00d1c33152dba033e4 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1512,4 +1512,7 @@
   <data name="CompressorDrive" xml:space="preserve">
     <value>CompressorDrive</value>
   </data>
+  <data name="Bus_ChassisConfiguration" xml:space="preserve">
+    <value>ChassisConfiguration</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
index 35d030c6dc25dcb45ef3e28618658e0798f89d4f..4d580242574703c7f7f7beb015af281ec4f78e23 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
@@ -425,7 +425,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 					retVal.TorqueConverterData.CertificationNumber = torqueConverter.CertificationNumber;
 					retVal.TorqueConverterData.Date = torqueConverter.Date;
 					retVal.TorqueConverterData.AppVersion = torqueConverter.AppVersion;
-					retVal.TorqueConverterData.TCData = torqueConverter.TCData;
 				}
 			}
 
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
index 29c416f019fe88e021f81048a6955b32d9a0fbe9..ec6e9c4e7008a76dfa580b512792fad571ca3d22 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/Gearbox/TorqueConverterData.cs
@@ -48,8 +48,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
 		protected internal readonly TorqueConverterEntry[] TorqueConverterEntries;
 
 		public string AppVersion { get; protected internal set; }
-		public DataTable TCData { get; protected internal set; }
-		
+
 		[Required, SIRange(0, double.MaxValue)]
 		public PerSecond ReferenceSpeed { get; protected internal set; }
 
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
index 7bc47dc1c39fb2ff4b6af675d43ab6f6c12955db..77f77735f53a1fbf3eb75554e26b47e31799d6d1 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
 				new XElement(tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
 				new XElement(tns + XMLNames.Bus_LegislativeCategory, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
-				new XElement(tns + "ChassisConfiguration", modelData.VehicleData.VehicleCategory.ToXMLFormat()),
+				new XElement(tns + XMLNames.Bus_ChassisConfiguration, modelData.VehicleData.VehicleCategory.ToXMLFormat()),
 				new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
 				new XElement(tns + XMLNames.Vehicle_Articulated, modelData.VehicleData.InputData.Articulated),
 				new XElement(tns + XMLNames.TPMLM, modelData.VehicleData.InputData.GrossVehicleMassRating.ToXMLFormat(0)),
@@ -195,30 +195,9 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + XMLNames.Report_DataWrap,
 					new XAttribute(xsi + "type", "TorqueConverterDataPIFType"),
 					GetCommonDescription(torqueConverter),
-					new XElement(tns + XMLNames.Component_AppVersion, torqueConverter.AppVersion), 
-					new XElement(tns + XMLNames.TorqueConverter_Characteristics,
-						GetTorqueConverterCharacteristics(torqueConverter.TCData))
+					new XElement(tns + XMLNames.Component_AppVersion, torqueConverter.AppVersion)
 				));
 		}
-
-		private List<XElement> GetTorqueConverterCharacteristics(DataTable tcData)
-		{
-			var characteristics = new List<XElement>();
-
-			foreach (DataRow row in tcData.Rows) {
-				var elementEntry = new XElement(tns + XMLNames.TorqueConverter_Characteristics_Entry,
-					new XAttribute(XMLNames.TorqueConverterData_SpeedRatio_Attr,
-						row[TorqueConverterDataReader.Fields.SpeedRatio].ToString()),
-					new XAttribute(XMLNames.TorqueConverterData_TorqueRatio_Attr,
-						row[TorqueConverterDataReader.Fields.TorqueRatio].ToString()),
-					new XAttribute(XMLNames.TorqueConverterDataMapping_InputTorqueRef_Attr,
-						row[TorqueConverterDataReader.Fields.CharacteristicTorque].ToString())
-				); 
-				characteristics.Add(elementEntry);
-			}
-
-			return characteristics;
-		}
 		
 		protected virtual XElement GetAxleWheelsDescription(VectoRunData modeldData)
 		{