diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 581ed04d6f9e83fb91a9395f435afc8a0225247e..73e1e2058aebe122d0a7aa1fac768636be640b74 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -1319,13 +1319,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public XMLDeclarationHEVSxPrimaryBusDataProviderV210(IXMLDeclarationJobInputData jobData, XmlNode xmlNode, string sourceFile) 
 			: base(jobData, xmlNode, sourceFile) { }
 
-		#region Overrides of XMLDeclarationVehicleDataProviderV10
-
-		public override IList<ITorqueLimitInputData> TorqueLimits =>
-			Components is XMLDeclarationPrimaryBusHEVSxComponentDataProviderV210
-				? null : base.TorqueLimits;
-
-		#endregion
 	}
 
 	// ---------------------------------------------------------------------------------------
@@ -1352,13 +1345,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public override TableData MaxPropulsionTorque => null;
 
 		#endregion
-
-		#region Overrides of XMLDeclarationVehicleDataProviderV10
-		
-		public override IList<ITorqueLimitInputData> TorqueLimits =>
-			Components is XMLDeclarationHEVSXLorryComponentsDataProviderV210 ? null : base.TorqueLimits;
-			
-		#endregion
 	}
 
 	// ---------------------------------------------------------------------------------------
@@ -1510,9 +1496,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		public override CubicMeter CargoVolume => null;
 
-		public override IList<ITorqueLimitInputData> TorqueLimits =>
-			Components is XMLDeclarationHeavyLorryPEVExComponentDataV210 ? null : base.TorqueLimits;
-
 		#endregion
 	}
 
@@ -1537,9 +1520,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		public override IPTOTransmissionInputData PTOTransmissionInputData => null;
 		public override XmlElement PTONode => null;
-		
-		public override IList<ITorqueLimitInputData> TorqueLimits =>
-			Components is XMLDeclarationHeavyLorryPEVExComponentDataV210 ? null : base.TorqueLimits;
 
 		#endregion
 
@@ -1572,13 +1552,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public override CubicMeter CargoVolume => null;
 
 		#endregion
-
-		#region Overrides of XMLDeclarationPEVMediumLorryExDataProviderV210
-
-		public override IList<ITorqueLimitInputData> TorqueLimits =>
-			Components is XMLDeclarationPrimaryBusPEVExComponentDataV210 ? null : base.TorqueLimits;
-
-		#endregion
 	}
 
 
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
index ad4c75d2079efcb9e25ad30ac661624953629211..6aec6104795655af691470d5a34b3e20fb8902e6 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
@@ -847,7 +847,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			//Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -896,7 +896,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -997,7 +997,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNull(vehicle.Components.BusAuxiliaries);
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1047,7 +1047,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNull(vehicle.Components.BusAuxiliaries);
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1139,7 +1139,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1184,7 +1184,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			//Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1470,7 +1470,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1516,7 +1516,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNotNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1611,7 +1611,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNull(vehicle.Components.BusAuxiliaries);
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1657,7 +1657,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNull(vehicle.Components.BusAuxiliaries);
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1744,7 +1744,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}
 
@@ -1787,7 +1787,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.IsNotNull(vehicle.Components.ElectricStorage);
 			Assert.IsNull(vehicle.Components.PTOTransmissionInputData);
 			Assert.IsNull(vehicle.CargoVolume);
-			Assert.IsNull(vehicle.TorqueLimits);
+			// Assert.IsNull(vehicle.TorqueLimits);
 			Assert.IsNull(vehicle.MaxPropulsionTorque);
 		}