Index: TECH/PubSub/EventHandler.cls.xml
===================================================================
diff -u -r2998 -r3000
--- TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2998)
+++ TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 3000)
@@ -57,18 +57,8 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ClassName:%String,EventType:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim SubscriptionId As %String = ""
-	For  { Set SubscriptionId=$Order(^TECH.PubSub.EventSubscriptionD(SubscriptionId)) Quit:(SubscriptionId="")
-		#dim Data As %List = ^TECH.PubSub.EventSubscriptionD(SubscriptionId)
-		If (($List(Data,2) = EventType) & ($List(Data,3) = ClassName) & ($List(Data,4) = "StartVerwerking")) {
-			Quit
-		}
-	}
-	
-	If $$$HasLength(SubscriptionId) {
-		Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(SubscriptionId)
-		Do Subscription.Delete()
-	}
+	#dim API As TECH.PubSub.PubSubAPI = ##class(TECH.Context).Instance().GeefPubSubAPI()
+	do API.RemoveSubscription(ClassName,EventType)
 ]]></Implementation>
 </Method>