Index: BL/Sys/FOP/CommonTasks.cls.xml
===================================================================
diff -u -r47931 -r53558
--- BL/Sys/FOP/CommonTasks.cls.xml	(.../CommonTasks.cls.xml)	(revision 47931)
+++ BL/Sys/FOP/CommonTasks.cls.xml	(.../CommonTasks.cls.xml)	(revision 53558)
@@ -549,13 +549,116 @@
 	Quit:('blnTSeqUniek)   ; Multiple TSeq-objects attached to this Task --> don't delete
 
 	; Remove objects
-	Set sc=$zobjclassmethod("Sys.FOP.QueueArchive","%DeleteId",QArchID)   ; ##class($$$QueueClassID).%DeleteId(QItemID)
-	If $L(TaskID) Do
-	. Set sc=$zobjclassmethod("Sys.FOP.Task","%DeleteId",TaskID)
-	. Set:($L(TSeqID)) sc=$zobjclassmethod("Sys.FOP.TaskSequence","%DeleteId",TSeqID)
+	Do ..VerwijderFopTaskEnVerwanten(TaskID,TSeqID,QArchID)
+
 	Quit
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderFopTaskEnVerwanten">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TaskId:%String,TaskSequenceId:%String,QueueArchiveId:%String</FormalSpec>
+<Implementation><![CDATA[
+	Try {
+		Do ..VerwijderFopQueueArchiveItem(QueueArchiveId)
+		If $L(TaskId) {
+			Do:($L(TaskSequenceId)) ..VerwijderFopTaskSequence(TaskSequenceId)
+			Do ..VerwijderFopTask(TaskId)
+		}
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do WLIP^vhDBG(97,"VerwijderFopTaskEnVerwanten: TaskId '"_TaskId_"' "_Exception.GeefOmschrijving())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderFopQueueArchiveItem">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>QueueArchiveId:%String</FormalSpec>
+<Implementation><![CDATA[
+	If $zobjclassmethod("Sys.FOP.QueueArchive","%ExistsId",QueueArchiveId) {
+		#dim sc As %Status = $zobjclassmethod("Sys.FOP.QueueArchive","%DeleteId",QueueArchiveId)
+		Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Kon Sys.FOP.QueueArchive met ID '"_QueueArchiveId_"' niet verwijderen")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderFopTaskSequence">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TaskSequenceId:%String</FormalSpec>
+<Implementation><![CDATA[
+	If $zobjclassmethod("Sys.FOP.TaskSequence","%ExistsId",TaskSequenceId) {
+		Do ..VerwijderFopTSequenceStreams(TaskSequenceId)
+		
+		#dim sc As %Status = $zobjclassmethod("Sys.FOP.TaskSequence","%DeleteId",TaskSequenceId)
+		Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Kon Sys.FOP.TaskSequence met ID '"_TaskSequenceId_"' niet verwijderen")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderFopTask">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TaskId:%String</FormalSpec>
+<Implementation><![CDATA[
+	If $zobjclassmethod("Sys.FOP.Task","%ExistsId",TaskId) {
+		Do ..VerwijderFopTaskStreams(TaskId)
+		
+		#dim sc As %Status = $zobjclassmethod("Sys.FOP.Task","%DeleteId",TaskId)
+		Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc,"Kon Sys.FOP.Task met ID '"_TaskId_"' niet verwijderen")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderFopTSequenceStreams">
+<Description>
+Do ##class(BL.Sys.FOP.CommonTasks).VerwijderFopTSequenceStreams(Id) </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TaskSequenceId:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set FopTaskSequence = ##class(Sys.FOP.TaskSequence).%OpenId(TaskSequenceId)
+	If ($IsObject(FopTaskSequence)) {
+		Set ItemsIt = ##class(TECH.ListIterator).%New(FopTaskSequence.Items)
+		While (ItemsIt.HasNext()) {
+			#dim TSequenceItem As Sys.FOP.emSeqItem = ItemsIt.Next()
+			Do TSequenceItem.VerwijderBewaardeStreams()
+		}
+	}
+	Set FopTaskSequence = ""   ; Force unswizzle object
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderFopTaskStreams">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TaskId:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set FopTask = ##class(Sys.FOP.Task).%OpenId(TaskId)
+	If ($IsObject(FopTask)) {
+		Do ..VerwijderArrayOfDocStreams(FopTask.Docs)
+		If $IsObject(FopTask.DocMulti) {
+			Write !,"DocMulti "_FopTask.DocMulti
+			Do ..VerwijderArrayOfDocStreams(FopTask.DocMulti.Docs)
+		}
+	}
+	Set FopTask = ""   ; Force unswizzle object
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderArrayOfDocStreams">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ArrayOfemDoc:%ArrayOfObjects</FormalSpec>
+<Implementation><![CDATA[
+	If $IsObject(ArrayOfemDoc) && (ArrayOfemDoc.Count() > 0) {
+		Write !,"ArrayOfemDoc "_ArrayOfemDoc
+		
+		Set DocsIterator = ##class(TECH.ListIterator).%New(ArrayOfemDoc)
+		While (DocsIterator.HasNext()) {
+			#dim Doc As Sys.FOP.emDoc = DocsIterator.Next()
+			Write !,"Doc "_Doc_" - "_$$$LCVT(Doc.DataStream.%Id())_"."
+			Do Doc.DataStream.Clear()
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>