Index: BL/Sys/FOP/TaskMgr.cls.xml
===================================================================
diff -u -r73805 -r73967
--- BL/Sys/FOP/TaskMgr.cls.xml	(.../TaskMgr.cls.xml)	(revision 73805)
+++ BL/Sys/FOP/TaskMgr.cls.xml	(.../TaskMgr.cls.xml)	(revision 73967)
@@ -242,10 +242,8 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	If blnFileWWW Do
-	. Do ##class(BL.Sys.FOP.DocBaseV7Helper).StelInEnGeefTerugTijdelijkActiefVoorFakeTask(..KeywordsDefault(,"DocRenderAndFile"),"\inetpub\pdfs")
 	. Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, $S($L(..DocRef):..DocRef, 1:"TestWV"))
 	. Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
-	. Kill %WVActivateDocBaseV7
 	Else  Do
 	. Do ..BuildFileData("File", .FName,.Dir,.FilePath, ..DocRef)
 	. ;Set FileURL=""
Index: BL/Flow/Basis/DocNew.cls.xml
===================================================================
diff -u -r73805 -r73967
--- BL/Flow/Basis/DocNew.cls.xml	(.../DocNew.cls.xml)	(revision 73805)
+++ BL/Flow/Basis/DocNew.cls.xml	(.../DocNew.cls.xml)	(revision 73967)
@@ -250,10 +250,8 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	If blnFileWWW Do
-	. Do ##class(BL.Sys.FOP.DocBaseV7Helper).StelInEnGeefTerugTijdelijkActiefVoorFakeTask(..KeywordsDefault(,"DocRenderAndFile"),"\inetpub\pdfs")
 	. Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, $S($L(..DocRef):..DocRef, 1:"TestWV"))
 	. Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
-	. Kill %WVActivateDocBaseV7
 	Else  Do
 	. Do ..BuildFileData("File", .FName,.Dir,.FilePath, ..DocRef)
 	. ;Set FileURL=""
Index: BL/Sys/FOP/DocBase.cls.xml
===================================================================
diff -u -r73590 -r73967
--- BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 73590)
+++ BL/Sys/FOP/DocBase.cls.xml	(.../DocBase.cls.xml)	(revision 73967)
@@ -492,7 +492,7 @@
 	Set Body=Body_"Error message: "_$$ParseStatus^vhLib($G(Error))_$$$CRLF
 	Set Body=Body_""_$$$CRLF
 	Set Body=Body_$$$CRLF_"Groep   : "_"DocBase"
-	Set Body=Body_$$$CRLF_"Actie   : "_"RunDocBaseWS" _ $$$If(($G(%WVActivateDocBaseV7) = 1), "  v7.0.1  (NEW DOCBASE01)", "  v4 (FOP)")
+	Set Body=Body_$$$CRLF_"Actie   : "_"RunDocBaseWS" _ "  v7.0.1  (NEW DOCBASE01)"   ;  _ $$$If(($G(%WVActivateDocBaseV7) = 1), "  v7.0.1  (NEW DOCBASE01)", "  v4 (FOP)")
 	Set Body=Body_$$$CRLF_"Detail  : "_msgData
 	;Set Body=Body_$$$CRLF_"Error   : "_$$ParseStatus^vhLib(Error)
 	Set Body=Body_$$$CRLF
Index: BL/Sys/FOP/Verwerker.cls.xml
===================================================================
diff -u -r73596 -r73967
--- BL/Sys/FOP/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 73596)
+++ BL/Sys/FOP/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 73967)
@@ -76,9 +76,6 @@
 	  ;s y=x   ; create an error
 	  ;d WLIP^vhDBG(97,"RunTask : (ID:"_$S($G(Task):Task.%Id(), 1:"")_") "_Task)
 	Set oLog=##class(Sys.FOP.Logging).AddToLog("INFO","Task","RunTask","Task "_$$$TaskInfo_" started.")
-	
-	Do:($IsObject(Task)) ##class(BL.Sys.FOP.DocBaseV7Helper).VerwerkTijdelijkActiefDocBaseV7( Task )
-	
 	Set:($$$ISOK(sc)) sc=Task.UpdateStatus($$$tsBusy)
 	Set:($$$ISOK(sc)) sc=$$rntPrepare()
 	Set:($$$ISOK(sc)) sc=TSeq.%Save()
Index: BL/Flow/Offerte/Doc.cls.xml
===================================================================
diff -u -r73805 -r73967
--- BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73805)
+++ BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73967)
@@ -170,10 +170,8 @@
 
 	Set lbOfferte=$S((OFFNr?1"O-".E):$LB($P(OFFNr,"-",2),"KOF"), 1:$LB(OFFNr,"WS"))
 	Set FilePath=$G(FileURL)
-	Do ##class(BL.Sys.FOP.DocBaseV7Helper).StelInEnGeefTerugTijdelijkActiefVoorFakeTask(..KeywordsDefault(,"DocRenderAndFile"),"\inetpub\pdfs")
 	Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, $LG(lbOfferte,1),$LG(lbOfferte,2))
 	Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
-	Kill %WVActivateDocBaseV7
 	Quit ..RenderAndFileDoc(.OFFNr,FilePath)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/common/Document/impl/DocBase/WebServerUrlDocBaseV7Bepaler/Test.cls.xml
===================================================================
diff -u -r73850 -r73967
--- vhUnitTest/APPS/common/Document/impl/DocBase/WebServerUrlDocBaseV7Bepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 73850)
+++ vhUnitTest/APPS/common/Document/impl/DocBase/WebServerUrlDocBaseV7Bepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 73967)
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.common.Document.impl.DocBase.WebServerUrlDocBaseV7Bepaler.Test">
-<Description>
- Do ##class(vhUnitTest.Manager).RunTest("/display=all","zTryout.WV.impl.DocBaseUrlPathBuilder")</Description>
 <Super>vhUnitTest.TestCase</Super>
 
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do ##super(aTestName)
-	Set %WVActivateDocBaseV7 = 1   ; Quick-and-dirty work-around om ProjectSetting te activeren. Shame on me  :-P
+	;Set %WVActivateDocBaseV7 = 1   ; Quick-and-dirty work-around om ProjectSetting te activeren. Shame on me  :-P
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Kill %WVActivateDocBaseV7
+	;Kill %WVActivateDocBaseV7
 	Do ##super(aTestName)
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
-	Kill %WVActivateDocBaseV7
+	;Kill %WVActivateDocBaseV7
 	Do ##super()
 ]]></Implementation>
 </Method>
Index: BL/Prod/VoorraadTelling.cls.xml
===================================================================
diff -u -r73802 -r73967
--- BL/Prod/VoorraadTelling.cls.xml	(.../VoorraadTelling.cls.xml)	(revision 73802)
+++ BL/Prod/VoorraadTelling.cls.xml	(.../VoorraadTelling.cls.xml)	(revision 73967)
@@ -777,24 +777,16 @@
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <Implementation><![CDATA[
-	Kill %WVActivateDocBaseV7
-
 	#dim sc As %Status = $$$OK
 	#dim IsActiefDocBaseV7 As %Boolean = ..DocBaseV7Helper.IsActiefDocBaseV7()
 	
-	If $$$Not(IsActiefDocBaseV7) {
-		Set IsActiefDocBaseV7  = ..DocBaseV7Helper.StelInEnGeefTerugTijdelijkActiefVoorFakeTask(";VTELLING;FileDoc;", , )
-	}
-	
 	If IsActiefDocBaseV7 {
 		Set sc = ..PrintOneViaDfs(pxDoc,Printer)
 	}
 	Else {
 		Set sc = ..PrintOneViaWatchFolder(pxDoc,Printer)
 	}
 	
-	Kill %WVActivateDocBaseV7
-	
 	Quit sc
 ]]></Implementation>
 </Method>
Index: BL/Sys/FOP/Verwerker/tmpDev.mac.rou
===================================================================
diff -u -r73716 -r73967
--- BL/Sys/FOP/Verwerker/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 73716)
+++ BL/Sys/FOP/Verwerker/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 73967)
@@ -948,7 +948,7 @@
 	/***  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=  ***/
 	
 asqGeefLogInfoDocBaseV7()
-	Quit $$$If($G(%WVActivateDocBaseV7)=1,"Via DocBase01-PRD v7; ","")
+	Quit ""   ; $$$If($G(%WVActivateDocBaseV7)=1,"Via DocBase01-PRD v7; ","")
 	
 asqAddParamsRenderTask(SeqItem,Doc,DocBaseTemplate)
 #define SourceData   $S(SeqItem.DataInType="Stream":SeqItem.DataInStream, 1:SeqItem.DataIn)