Index: TECH/PubSub/PubSubAPI.cls.xml
===================================================================
diff -u -r1051 -r2511
--- TECH/PubSub/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 1051)
+++ TECH/PubSub/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 2511)
@@ -8,6 +8,11 @@
 <Abstract>1</Abstract>
 <ReturnType>TECH.PubSub.EventRaiser</ReturnType>
 </Method>
+
+<Method name="RemoveSubscription">
+<Abstract>1</Abstract>
+<FormalSpec>Classname:%String,Methodname:%String="StartVerwerking"</FormalSpec>
+</Method>
 </Class>
 
 
Index: TECH/PubSub/impl/PubSubAPI.cls.xml
===================================================================
diff -u -r1051 -r2511
--- TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 1051)
+++ TECH/PubSub/impl/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 2511)
@@ -3,11 +3,36 @@
 <Class name="TECH.PubSub.impl.PubSubAPI">
 <Super>TECH.RegisteredObject,TECH.PubSub.PubSubAPI</Super>
 
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..QueryAPI = ##class(TECH.Context).Instance().GeefQueryAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefEventRaiser">
 <ReturnType>TECH.PubSub.EventRaiser</ReturnType>
 <Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.SimpelEventRaiser).%New()
 ]]></Implementation>
 </Method>
+
+<Method name="RemoveSubscription">
+<FormalSpec>Classname:%String,Methodname:%String="StartVerwerking"</FormalSpec>
+<Implementation><![CDATA[
+	set Query = ##class(TECH.DynamicQuery).%New("DELETE FROM TECH_Pubsub.EventSubscription WHERE RespondingClass = ? AND RespondingMethod = ?",$listbuild(Classname,Methodname))
+	do ..QueryAPI.GetResultSet(Query)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/TECH/PubSub/PubSubAPI.cls.xml
===================================================================
diff -u -r2401 -r2511
--- vhTest/Mock/TECH/PubSub/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 2401)
+++ vhTest/Mock/TECH/PubSub/PubSubAPI.cls.xml	(.../PubSubAPI.cls.xml)	(revision 2511)
@@ -22,6 +22,12 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEventRaiser")
 ]]></Implementation>
 </Method>
+
+<Method name="RemoveSubscription">
+<FormalSpec>Classname:%String,Methodname:%String="StartVerwerking"</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("RemoveSubscription",Classname,Methodname)
+]]></Implementation>
+</Method>
 </Class>