diff --git a/Application.cfc b/Application.cfc
index 5199c3f..a5a4327 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -16,12 +16,14 @@
   	<cfset this.customTagPaths = expandPath(getDirectoryFromPath(getCurrentTemplatePath())&'mod')/>
   	<cfset this.datasource = "dwh"/>
 	
+
+	<cfset this.defaultdatasource = this.datasource/>
+	<cfset request.DS = "#this.datasource#">
+	<cfset this.datasources["#this.datasource#"]=getDS("#this.datasource#","ds_#this.datasource#")/>
+	<cfset this.datasources["billing-vc"]=getDS("billing-vc","ds_billing_vc")/>	
+	<cfset this.datasources["billing-s3"]=getDS("billing-s3","ds_billing_s3")/>
+	
   	
-	<cfset this.orchestrator_authorization_string=createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH")/>
-<!---  	<cfif isEmpty(this.orchestrator_authorization_string)>
-		<cfset this.orchestrator_authorization_string = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3"/><!--- *** remove --->
-		<cfset this.orchestrator_authorization_string = "Basic c3ZjX2xrcHJvZDoxMTBlMWJhMTFjOGE3YjAyMGFmY2FmNzdlODU3MTRmYzQx"/><!--- *** remove --->
-	</cfif>  --->
 
 	
 	
@@ -66,7 +68,7 @@
 		The API token is available in your personal configuration page. Click your name on the top right corner on every page, then click "Configure" to see your API token. (The URL $root/me/configure is a good shortcut.) You can also change your API token from here.
 		--->
 
-		<cfset ORCHESTRATOR_AUTH=this.orchestrator_authorization_string/>	
+		
 		
 		<cfset request.UNDEFINED_USR_ID=-1/>
 		<!--- request.ROOT_USR_ID=1 not used --->
@@ -75,9 +77,7 @@
 
 		<!--- global settings --->
 
-		<cfset this.datasource = "dwh"/>
-		<cfset this.defaultdatasource = this.datasource/>
-		<cfset request.DS = "#this.datasource#">
+
 		
 		<!--- <cfdump var=#GetApplicationSettings()#/> --->
 		
@@ -93,11 +93,9 @@
 		<cfif !structKeyExists(this.datasources,"billing-s3")>
 			<cfset this.datasources["billing-s3"]=getDS("billing-s3","ds_billing_s3")/>
 		</cfif> --->
-		<cfset this.datasources["#this.datasource#"]=getDS("#this.datasource#","ds_#this.datasource#")/>
-		<cfset this.datasources["billing-vc"]=getDS("billing-vc","ds_billing_vc")/>	
-		<cfset this.datasources["billing-s3"]=getDS("billing-s3","ds_billing_s3")/>
+
 		
-		<cfdump var=#this.datasources#/>
+		<!--- <cfdump var=#this.datasources#/> --->
 		
 		
 		<cfset request.RECORDS_PER_PAGE=500/>