Index: TECH/PubSub/EventHandler.cls.xml
===================================================================
diff -u -r2993 -r2996
--- TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2993)
+++ TECH/PubSub/EventHandler.cls.xml	(.../EventHandler.cls.xml)	(revision 2996)
@@ -35,6 +35,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="UnInstall">
+<ClassMethod>1</ClassMethod>
+<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) = ..GetEventType()) & ($List(Data,3) = ..%ClassName(1)) & ($List(Data,4) = "StartVerwerking")) {
+			Quit
+		}
+	}
+	
+	If $$$HasLength(SubscriptionId) {
+		Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(SubscriptionId)
+		Do Subscription.Delete()
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GetEventType">
 <ClassMethod>1</ClassMethod>
 <Private>1</Private>