Index: vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml
===================================================================
diff -u -r3006 -r3022
--- vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3006)
+++ vhTest/Fake/TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 3022)
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.TECH.PubSub.impl.PubSubAPI">
-<Super>TECH.PubSub.impl.PubSubAPI</Super>
-
-<Method name="GeefEventRaiser">
-<ReturnType>TECH.PubSub.EventRaiser</ReturnType>
-<Implementation><![CDATA[	Quit ##class(vhTest.Fake.TECH.PubSub.EventRaiser).%New()
-]]></Implementation>
-</Method>
+<Super>TECH.RegisteredObject</Super>
 </Class>
 
 
Index: vhTest/Fake/TECH/PubSub/EventRaiser.cls.xml
===================================================================
diff -u -r3006 -r3022
--- vhTest/Fake/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3006)
+++ vhTest/Fake/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3022)
@@ -1,107 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.TECH.PubSub.EventRaiser">
-<Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
-
-<Property name="AsyncEvents">
-<Type>%ListOfObjects</Type>
-<Collection>array</Collection>
-<Private>1</Private>
-</Property>
-
-<Property name="SyncEvents">
-<Type>%ListOfObjects</Type>
-<Collection>array</Collection>
-<Private>1</Private>
-</Property>
-
-<Method name="RaiseEventAsync">
-<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..AsyncEvents )
-]]></Implementation>
-</Method>
-
-<Method name="RaiseEventSync">
-<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..SyncEvents )
-]]></Implementation>
-</Method>
-
-<Method name="AddEventToArrayList">
-<FormalSpec>Event:TECH.PubSub.Event,EventArray:%ArrayOfObjects</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-
-	if 'EventArray.IsDefined(Event.Type) {
-		do EventArray.SetAt( ##class(%ListOfObjects).%New() , Event.Type )
-	}
-	do EventArray.GetAt(Event.Type).Insert(Event)
-]]></Implementation>
-</Method>
-
-<Method name="GeefAantalNietSynchroneEvents">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..GeefAantalEvents(..AsyncEvents)
-]]></Implementation>
-</Method>
-
-<Method name="GeefAantalSynchroneEvents">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..GeefAantalEvents(..SyncEvents)
-]]></Implementation>
-</Method>
-
-<Method name="GeefNietSynchroneEventsVoorType">
-<FormalSpec>Type:%String</FormalSpec>
-<ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[
-	set Events = ##class(TECH.PubSub.EventList).%New()
-	if ..AsyncEvents.IsDefined(Type) {
-		set Events = ..AsyncEvents.GetAt(Type)
-	}
-	quit Events
-]]></Implementation>
-</Method>
-
-<Method name="GeefSynchroneEventsVoorType">
-<FormalSpec>Type:%String</FormalSpec>
-<ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[
-	set Events = ##class(TECH.PubSub.EventList).%New()
-	if ..SyncEvents.IsDefined(Type) {
-		set Events = ..SyncEvents.GetAt(Type)
-	}
-	quit Events
-]]></Implementation>
-</Method>
-
-<Method name="GeefAantalEventsVoorType">
-<FormalSpec>Type:%String</FormalSpec>
-<Implementation><![CDATA[
-	#dim AantalEvents As %Integer = 0
-	set AantalEvents = AantalEvents + ..GeefNietSynchroneEventsVoorType(Type).Count()
-	set AantalEvents = AantalEvents + ..GeefSynchroneEventsVoorType(Type).Count()
-	quit AantalEvents
-]]></Implementation>
-</Method>
-
-<Method name="GeefAantalEvents">
-<FormalSpec>EventArray:%ArrayOfObjects</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim AantalEvents As %Integer = 0
-	
-	set Iterator = ##class(TECH.ListIterator).%New(EventArray)
-	while Iterator.HasNext() {
-		#dim EventLijst As %ListOfObjects = Iterator.Next()
-		set AantalEvents = AantalEvents + EventLijst.Count()
-	}
-	
-	quit AantalEvents
-]]></Implementation>
-</Method>
+<Super>TECH.RegisteredObject</Super>
 </Class>