Index: WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml
===================================================================
diff -u -r44842 -r45873
--- WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 44842)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper.cls.xml	(.../Helper.cls.xml)	(revision 45873)
@@ -13,21 +13,15 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SettingsManager">
-<Type>WSimpl.Vhisie4.SettingsManager</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>LegacyPartijAPI:DOM.PARTIJ.LegacyPartijAPI,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,SettingsManager:WSimpl.Vhisie4.SettingsManager</FormalSpec>
+<FormalSpec>LegacyPartijAPI:DOM.PARTIJ.LegacyPartijAPI,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..LegacyPartijAPI = $$$Inject(LegacyPartijAPI, ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI())
 	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository, ##class(DOM.common.impl.HandelPersonalityRepository).%New())
-	Set ..SettingsManager = $$$Inject(SettingsManager, ##class(WSimpl.Vhisie4.SettingsManager).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -41,8 +35,7 @@
 		Quit:..LegacyPartijAPI.IsKlantPartijID(KlantId) KlantId	
 		Quit ..LegacyPartijAPI.GeefKlantPartijID(KlantId)
 	} Else {
-		#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(PersonalityId)
-		Quit ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_KlantId
+		Quit ..HandelPersonalityRepository.GeefViaID(PersonalityId).GeefPrefix()_KlantId
 	}
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefKlantPartijID/Test.cls.xml
===================================================================
diff -u -r45711 -r45873
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefKlantPartijID/Test.cls.xml	(.../Test.cls.xml)	(revision 45711)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/WinkelkarService/Helper/GeefKlantPartijID/Test.cls.xml	(.../Test.cls.xml)	(revision 45873)
@@ -63,7 +63,7 @@
 	
 	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(LegacyPartijApiMock)
 	
-	#dim AntwoordKlantId = Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).VanHoecke())
+	Do Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).VanHoecke())
 	
 	Do LegacyPartijApiMock.Verifieer()
 ]]></Implementation>
@@ -75,17 +75,14 @@
 	#dim PersonalityId = ##class(DOM.common.enu.Personality).Daro()
 	
 	Set HandelPersonality = ##class(vhTest.Mock.DOM.common.HandelPersonality).%New()
+	Do HandelPersonality.IndienMethodCall("GeefPrefix").DanReturn(##class(DOM.common.enu.Personality).Daro())
 	Set HandelPersonalityRepoMock = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelPersonalityRepoMock.VerwachtMethodCall("GeefViaID", PersonalityId).DanReturn(HandelPersonality)
 	
-	Set SettingsManagerMock = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerMock.VerwachtMethodCall("GeefVhisie4Prefix",HandelPersonality)
+	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(,HandelPersonalityRepoMock)
 	
-	Set Helper = ##class(WSimpl.Vhisie4.Winkelkar.WinkelkarService.Helper).%New(,HandelPersonalityRepoMock,SettingsManagerMock)
+	Do Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).Daro())
 	
-	#dim AntwoordKlantId = Helper.GeefKlantPartijID(KlantId, ##class(DOM.common.enu.Personality).Daro())
-	
-	Do SettingsManagerMock.Verifieer()
 	Do HandelPersonalityRepoMock.Verifieer()
 ]]></Implementation>
 </Method>