Index: WS/EC/Unishop/InternationaleZending/Service.cls.xml
===================================================================
diff -u -r33181 -r33205
--- WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33181)
+++ WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 33205)
@@ -25,11 +25,9 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVKPOfferteServiceAPI())
-	Set ..ZendingDetails = $$$Implementation(ZendingDetails,##class(APPS.ApplicatieContext).Instance().GeefInternationaleZendingAPI())
-
+	Set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.VKP.impl.OfferteService).%New())
 	Set ..NaarBerekenInputConverter = $$$Implementation(NaarBerekenInputConverter, ##class(APPS.VKP.OfferteService.impl.NaarBerekenInputConverter).%New())
-	
+	Set ..ZendingDetails = $$$Implementation(ZendingDetails, ##class(WS.EC.Unishop.InternationaleZending.impl.ZendingDetails).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
Index: APPS/ApplicatieContext.cls.xml
===================================================================
diff -u -r33181 -r33205
--- APPS/ApplicatieContext.cls.xml	(.../ApplicatieContext.cls.xml)	(revision 33181)
+++ APPS/ApplicatieContext.cls.xml	(.../ApplicatieContext.cls.xml)	(revision 33205)
@@ -22,14 +22,6 @@
 <Private>1</Private>
 </Property>
 
-<Parameter name="InternationaleZendingAPI">
-<Default>InternationaleZendingAPI</Default>
-</Parameter>
-
-<Parameter name="VKPOfferteServiceAPI">
-<Default>VKPOfferteServiceAPI</Default>
-</Parameter>
-
 <Parameter name="CommonAPI">
 <Type>%String</Type>
 <Default>CommonAPI</Default>
@@ -148,30 +140,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVKPOfferteServiceAPI">
-<ReturnType>APPS.VKP.impl.OfferteService</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefAPIObject(..#VKPOfferteServiceAPI)
-]]></Implementation>
-</Method>
-
-<Method name="GeefInternationaleZendingAPI">
-<ReturnType>WS.EC.Unishop.InternationaleZending.impl.ZendingDetails</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefAPIObject(..#InternationaleZendingAPI)
-]]></Implementation>
-</Method>
-
-<Method name="PushVKPOfferteServiceAPIClassName">
-<FormalSpec>Naam:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..PushAPINaam(..#VKPOfferteServiceAPI, Naam)
-]]></Implementation>
-</Method>
-
-<Method name="PushInternationaleZendingAPIClassName">
-<FormalSpec>Naam:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..PushAPINaam(..#InternationaleZendingAPI, Naam)
-]]></Implementation>
-</Method>
-
 <Method name="GeefMaatwerkAPI">
 <ReturnType>APPS.PM.MaatwerkAPI</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefAPIObject(..#MaatwerkAPI)
@@ -451,13 +419,6 @@
 		Do APINamenIterator.Next().Clear()
 	}
 	// Put defaults on the stack
-	
-	#dim InternationaleZendingClassName As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("WS.EC.Unishop.InternationaleZending.impl.ZendingDetails")
-	Do ..PushInternationaleZendingAPIClassName(InternationaleZendingClassName)
-
-	#dim VKPOfferteServiceClassName As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.VKP.impl.OfferteService")
-	Do ..PushVKPOfferteServiceAPIClassName(VKPOfferteServiceClassName)
-
 	Do ..PushTransportAPIClassName(##class(APPS.TRANSP.impl.TransportAPI).%ClassName(1))
 	Do ..PushPrintAPIClassName(##class(APPS.common.Print.impl.PrintAPI).%ClassName(1))
 	Do ..PushDocumentAPIClassName(##class(APPS.common.Document.impl.DocumentAPI).%ClassName(1))
FishEye: Tag 33205 refers to a dead (removed) revision in file `vhDeploy/Deploy20160316InternationaleZendingContext.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml
===================================================================
diff -u -r33181 -r33205
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33181)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 33205)
@@ -31,20 +31,6 @@
 	Do $$$AssertObject(ZendingDetails, Resultaat)
 ]]></Implementation>
 </Method>
-
-<Method name="Test: GeefMogelijkeZendingen geeft testData voor intracto.">
-<Implementation><![CDATA[
-	Set Service = ##class(WS.EC.Unishop.InternationaleZending.Service).%New()
-	#dim Resultaat As APPS.TRANSP.OfferteService.dto.OfferteData = Service.GeefMogelijkeZendingen(0)
-	
-	Do $$$AssertIsObject(Resultaat)
-	Do $$$AssertEquals(Resultaat.Items.Count(),4)
-	Do $$$AssertEquals(Resultaat.Items.GetAt(1).Code,1)
-	Do $$$AssertEquals(Resultaat.Items.GetAt(2).Code,2)
-	Do $$$AssertEquals(Resultaat.Items.GetAt(3).Code,3)
-	Do $$$AssertEquals(Resultaat.Items.GetAt(4).Code,4)
-]]></Implementation>
-</Method>
 </Class>
 
 
FishEye: Tag 33205 refers to a dead (removed) revision in file `vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 33205 refers to a dead (removed) revision in file `vhTest/Stub/APPS/VKP/impl/OfferteService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 33205 refers to a dead (removed) revision in file `vhTest/Mock/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 33205 refers to a dead (removed) revision in file `vhTest/Fake/vhTest/Stub/WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?