Index: vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml
===================================================================
diff -u -r49331 -r50884
--- vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 49331)
+++ vhUnitTest/AXimpl/Utils/KlantIdConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 50884)
@@ -42,39 +42,31 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ConvertToVanHoecke converteert in modus 2A een AX KlantId naar een Van Hoecke KlantId">
+<Method name="Test: ConvertToVanHoecke converteert een AX KlantId naar een Van Hoecke KlantId">
 <Implementation><![CDATA[
-	Do ..AssertVanHoeckeKlantId($$$False, "00123", ..VanHoeckePersonality, "00123")
-	Do ..AssertVanHoeckeKlantId($$$True, "00123", ..VanHoeckePersonality, "123")
-	Do ..AssertVanHoeckeKlantId($$$False, "00123", ..NietVanHoeckePersonality, "00123")
-	Do ..AssertVanHoeckeKlantId($$$True, "00123", ..NietVanHoeckePersonality, "00123")
+	Do ..AssertVanHoeckeKlantId("00123", ..VanHoeckePersonality, "123")
+	Do ..AssertVanHoeckeKlantId("00123", ..NietVanHoeckePersonality, "00123")
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ConvertToAx converteert in modus 2A een Van Hoecke KlantId naar een AX KlantId">
+<Method name="Test: ConvertToAx converteert een Van Hoecke KlantId naar een AX KlantId">
 <Implementation><![CDATA[
-	Do ..AssertAxKlantId($$$False, "K||123", ..VanHoeckePersonality, "K||123")
-	Do ..AssertAxKlantId($$$True, "K||123", ..VanHoeckePersonality, "00123")
-	Do ..AssertAxKlantId($$$False, "K||123", ..NietVanHoeckePersonality, "K||123")
-	Do ..AssertAxKlantId($$$True, "K||123", ..NietVanHoeckePersonality, "K||123")
+	Do ..AssertAxKlantId("K||123", ..VanHoeckePersonality, "00123")
+	Do ..AssertAxKlantId("K||123", ..NietVanHoeckePersonality, "K||123")
 ]]></Implementation>
 </Method>
 
 <Method name="AssertVanHoeckeKlantId">
-<FormalSpec>ConfigFlag:%Boolean,KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
+<FormalSpec>KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ConfigFlag, ..#Applicatie)
-	Do $$$AssertEquals(..KlantIdConverter.ConvertToVanHoecke(KlantId, PersonalityId), VerwachteKlantId)
+<Implementation><![CDATA[	Do $$$AssertEquals(..KlantIdConverter.ConvertToVanHoecke(KlantId, PersonalityId), VerwachteKlantId)
 ]]></Implementation>
 </Method>
 
 <Method name="AssertAxKlantId">
-<FormalSpec>ConfigFlag:%Boolean,KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
+<FormalSpec>KlantId:%String,PersonalityId:%String,VerwachteKlantId:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[
-	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("KlantIdAx2A", ConfigFlag, ..#Applicatie)
-	Do $$$AssertEquals(..KlantIdConverter.ConvertToAx(KlantId, PersonalityId), VerwachteKlantId)
+<Implementation><![CDATA[	Do $$$AssertEquals(..KlantIdConverter.ConvertToAx(KlantId, PersonalityId), VerwachteKlantId)
 ]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/Utils/KlantIdConverter.cls.xml
===================================================================
diff -u -r50061 -r50884
--- AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 50061)
+++ AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 50884)
@@ -7,7 +7,7 @@
 <FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+	If (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
 		Set KlantId = +KlantId
 	}
 	
@@ -19,9 +19,9 @@
 <FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+	If (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
 		If ##class(TECH.StringUtils).StartsWith(KlantId,"K||") {
-			Set KlantId = ##class(TECH.StringUtils).AlignRight($Extract(KlantId, 4, *), 0, 5)
+			Set KlantId = ##class(TECH.StringUtils).AlignRight($extract(KlantId, 4, *), 0, 5)
 		} Else {
 			Set KlantId = ##class(TECH.StringUtils).AlignRight(+KlantId, 0, 5)
 		}