Index: BL/Prod/OptiBox/Diverse.cls.xml
===================================================================
diff -u -r29059 -r29980
--- BL/Prod/OptiBox/Diverse.cls.xml	(.../Diverse.cls.xml)	(revision 29059)
+++ BL/Prod/OptiBox/Diverse.cls.xml	(.../Diverse.cls.xml)	(revision 29980)
@@ -338,8 +338,8 @@
 <Implementation><![CDATA[
 	#dim IsAlive As %Boolean = $$$False
 
-	#dim OptimizerLocation As %String = ..GeefOptimizerLocation(OptiboxServer)
-	#dim wsOptimizer As WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS = ##class(BL.Prod.OptiBox.Optimize).%New().GeefOptimizerWSClient(OptimizerLocation)
+	#dim OptimizerLocation As %String = ##class(BL.Prod.OptiBox.Optimize).GeefOptimizerLocation(OptiboxServer)
+	#dim wsOptimizer As WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS = ##class(BL.Prod.OptiBox.Optimize).GeefOptimizerWSClient(OptimizerLocation)
 	Set wsOptimizer.Timeout=5
 
 	Try {
@@ -382,7 +382,7 @@
 <Implementation><![CDATA[
 	Set $ETRAP="Do ##class("_..%ClassName(1)_").TrapHandlerSoap()"
 	Set wsOptimizer=##class(WS.Prod.PanOpti.OptimizerBindingPanOptimizerWS).%New()
-	Do wsOptimizer.SetLocation(..GeefOptimizerLocation(OptiServer))
+	Do wsOptimizer.SetLocation(##class(BL.Prod.OptiBox.Optimize).GeefOptimizerLocation(OptiServer))
 
 	Quit wsOptimizer.AreYouAlive()
 ]]></Implementation>
@@ -396,22 +396,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOptimizerLocation">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>OptiboxServer:BL.Prod.OptiBox.enu.OptiServer</FormalSpec>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim OptimizerLocation As %String
-	If (OptiboxServer=##class(BL.Prod.OptiBox.enu.OptiServer).Big()) {
-		Set OptimizerLocation = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_OptiboxBIG_ServiceLocation")
-	}Else{
-		Set OptimizerLocation = ##class(TECH.Config.ConfigMgr).Instance().GetString("SOAPlib_OptiboxSMALL_ServiceLocation")
-	}
-	Quit OptimizerLocation
-]]></Implementation>
-</Method>
-
 <UDLText name="T">
 <Content><![CDATA[
 /*********************