diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
index 1d77b723a73651cd5d36d323a0f06f46179340a8..67b16af98c64f92b6e687f625c7e2cdbd718a276 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs
@@ -359,83 +359,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
         }
     }
 
-    public class XMLBatteryPackDeclarationDeclarationInputDataV24 : AbstractCommonComponentType,
-		IXMLBatteryPackDeclarationInputData
-	{
-		public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V24;
-		public const string XSD_TYPE = "REESSBatteryType";
-		public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
-
-		[Obsolete]
-        public XMLBatteryPackDeclarationDeclarationInputDataV24(XmlNode componentNode, string sourceFile) 
-			: base(componentNode, sourceFile)
-		{
-			throw new NotImplementedException("Replaced with v2.3 dataprovider");
-			//SourceType = DataSourceType.XMLEmbedded;
-		}
-		
-		#region Implementation of IREESSPackInputData
-
-		public REESSType StorageType => REESSType.Battery;
-
-		#endregion
-
-		#region Implementation of IBatteryPackDeclarationInputData
-
-		public virtual double? MinSOC  => 
-			ElementExists(XMLNames.Battery_SOCmin) ? GetDouble(XMLNames.Battery_SOCmin) / 100 : (double?)null;
-
-		public virtual double? MaxSOC => 
-			ElementExists(XMLNames.Battery_SOCmax) ? GetDouble(XMLNames.Battery_SOCmax) / 100 : (double?)null;
-
-		public virtual BatteryType BatteryType => GetString(XMLNames.REESS_BatteryType).ParseEnum<BatteryType>();
-		public virtual AmpereSecond Capacity => GetDouble(XMLNames.REESS_RatedCapacity).SI(Unit.SI.Ampere.Hour).Cast<AmpereSecond>();
-
-		public virtual bool? ConnectorsSubsystemsIncluded => CertificationMethod == CertificationMethod.StandardValues
-			? (bool?)null
-			: GetBool(XMLNames.REESS_ConnectorsSubsystemsIncluded);
-
-		public virtual bool? JunctionboxIncluded => CertificationMethod == CertificationMethod.StandardValues
-			? (bool?)null
-			: GetBool(XMLNames.REESS_JunctionboxIncluded);
-
-		public virtual Kelvin TestingTemperature => CertificationMethod != CertificationMethod.StandardValues
-			? GetDouble(XMLNames.REESS_TestingTemperature).DegCelsiusToKelvin()
-			: null;
-
-		public virtual TableData InternalResistanceCurve => ReadTableData(XMLNames.REESS_InternalResistanceCurve, XMLNames.REESS_MapEntry,
-			AttributeMappings.InternalResistanceMap);
-		
-		public virtual TableData VoltageCurve => ReadTableData(XMLNames.REESS_OCV, XMLNames.REESS_MapEntry, 
-			AttributeMappings.VoltageMap);
-		
-		public virtual TableData MaxCurrentMap => ReadTableData(XMLNames.REESS_CurrentLimits, XMLNames.REESS_MapEntry, 
-			AttributeMappings.MaxCurrentMap);
-
-        #endregion
-
-		#region Overrides of AbstractXMLResource
-
-		protected override XNamespace SchemaNamespace => NAMESPACE_URI;
-		protected override DataSourceType SourceType => DataSourceType.XMLFile;
-
-		#endregion
-	}
-
-    // ---------------------------------------------------------------------------------------
-
-    public class XMLBatteryPackDeclarationDeclarationInputDataV01 : XMLBatteryPackDeclarationDeclarationInputDataV24
-	{
-		public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
-		public const string XSD_TYPE = "REESSBatteryType";
-
-		public static readonly string QUALIFIED_XSD_TYPE =
-			XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
-
-		public XMLBatteryPackDeclarationDeclarationInputDataV01(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile) { }
-
-	}
-
 	public class XMLBatteryPackDeclarationInputDataMeasuredV01 : AbstractBatteryPackDeclarationInputDataProvider
 	{
 		public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;