diff --git a/scripts/display_results.sh b/scripts/display_results.sh
index 0e5b9131..9aa01099 100755
--- a/scripts/display_results.sh
+++ b/scripts/display_results.sh
@@ -11,9 +11,6 @@ function display_results {
     MEASUREMENT_COUNT=${MEASUREMENT_COUNT:-}
     WORKFLOW_ID=${WORKFLOW_ID:-}
     DASHBOARD_API_BASE=${DASHBOARD_API_BASE:-}
-    MACHINE_POWER_HASHMAP=${MACHINE_POWER_HASHMAP:-}
-    MACHINE_POWER_DATA=${MACHINE_POWER_DATA:-}
-
 
     output="/tmp/eco-ci/output.txt"
     output_pr="/tmp/eco-ci/output-pr.txt"
diff --git a/scripts/make_measurement.sh b/scripts/make_measurement.sh
index 3e767db4..2faa755b 100755
--- a/scripts/make_measurement.sh
+++ b/scripts/make_measurement.sh
@@ -11,7 +11,6 @@ function make_measurement() {
     MEASUREMENT_COUNT=${MEASUREMENT_COUNT:-}
     WORKFLOW_ID=${WORKFLOW_ID:-}
     DASHBOARD_API_BASE=${DASHBOARD_API_BASE:-}
-    MACHINE_POWER_HASHMAP=${MACHINE_POWER_HASHMAP:-}
     MACHINE_POWER_DATA=${MACHINE_POWER_DATA:-}
 
 
@@ -32,10 +31,12 @@ function make_measurement() {
     # check wc -l of cpu-util is greater than 0
     if [[ $(wc -l < /tmp/eco-ci/cpu-util-temp.txt) -gt 0 ]]; then
 
-        if [[ $MACHINE_POWER_HASHMAP == "" ]]; then
+        if [[ -n "$BASH_VERSION" ]] && (( ${BASH_VERSION:0:1} >= 4 )); then
             echo "Using bash mode inference"
+            source "$(dirname "$0")/../machine-power-data/${MACHINE_POWER_DATA}" # will set cloud_energy_hashmap
+
             while read -r time util; do
-                echo "$time * ${MACHINE_POWER_HASHMAP[$util]}" | bc -l >> /tmp/eco-ci/energy-step.txt
+                echo "$time * ${cloud_energy_hashmap[$util]}" | bc -l >> /tmp/eco-ci/energy-step.txt
             done < /tmp/eco-ci/cpu-util-temp.txt
         else
             echo "Using legacy mode inference"
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 327f8c76..a2901ea1 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -15,11 +15,6 @@ function initialize {
     # call init_variables
     source "$(dirname "$0")/vars.sh" cpu_vars
     source "$(dirname "$0")/vars.sh" add_var DASHBOARD_API_BASE "https://api.green-coding.io"
-
-    if [[ -n "$BASH_VERSION" ]] && (( ${BASH_VERSION:0:1} >= 4 )); then
-        source "$(dirname "$0")/../machine-power-data/${MACHINE_POWER_DATA}"
-        source "$(dirname "$0")/vars.sh" add_var MACHINE_POWER_HASHMAP $cloud_energy_hashmap
-    fi
 }