Index: APPS/Halux/common/impl/BatchImpl.cls.xml
===================================================================
diff -u -r1073 -r1133
--- APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 1073)
+++ APPS/Halux/common/impl/BatchImpl.cls.xml	(.../BatchImpl.cls.xml)	(revision 1133)
@@ -3,7 +3,7 @@
 <Class name="APPS.Halux.common.impl.BatchImpl">
 <ClassType>persistent</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%Persistent,APPS.Halux.common.Batch</Super>
+<Super>APPS.Halux.common.Batch</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Lijn">
@@ -240,31 +240,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="%OnDelete">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>oid:%ObjectIdentity</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set Batch = ..%Open(oid)
-	If ($IsObject(Batch))
-	{
-		Do ..RaiseBatchRemovedEvent(Batch.%Id())
-	}
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="RaiseBatchRemovedEvent">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>BatchID:%Integer</FormalSpec>
-<Implementation><![CDATA[
-	Set EventData = ##class(DOM.PM.Maatwerk.TBX.BatchRemovedData).%New(BatchID)
-	Set Event = ##class(DOM.PM.Maatwerk.TBX.BatchRemovedEvent).%New(EventData)
-	Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(Event)
-]]></Implementation>
-</Method>
-
 <Trigger name="DeleteTrigger">
 <Code>	Do ..RaiseBatchRemovedEvent({ID})</Code>
 <Event>DELETE</Event>
@@ -274,27 +249,19 @@
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.Halux.common7FB.BatchImplD</DataLocation>
 <DefaultData>BatchImplDefaultData</DefaultData>
-<IdLocation>^APPS.Halux.common7FB.BatchImplD</IdLocation>
-<IndexLocation>^APPS.Halux.common7FB.BatchImplI</IndexLocation>
-<StreamLocation>^APPS.Halux.common7FB.BatchImplS</StreamLocation>
 <Data name="BatchImplDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
+<Subscript>"BatchImpl"</Subscript>
 <Value name="1">
-<Value>%%CLASSNAME</Value>
-</Value>
-<Value name="2">
 <Value>AanmaakTijdstip</Value>
 </Value>
-<Value name="3">
+<Value name="2">
 <Value>Lijn</Value>
 </Value>
-<Value name="4">
+<Value name="3">
 <Value>ProductieGroep</Value>
 </Value>
-<Value name="5">
+<Value name="4">
 <Value>Toeleveringen</Value>
 </Value>
 </Data>