diff --git a/migtests/scripts/live-migration-fallb-run-test.sh b/migtests/scripts/live-migration-fallb-run-test.sh
index 362ecd5bf..bac1a1e96 100755
--- a/migtests/scripts/live-migration-fallb-run-test.sh
+++ b/migtests/scripts/live-migration-fallb-run-test.sh
@@ -28,11 +28,6 @@ else
     source "${TEST_DIR}/env.sh"
 fi
 
-export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_fallb_export-dir"}
-if [ -n "${SOURCE_DB_SSL_MODE}" ]; then
-  EXPORT_DIR="${EXPORT_DIR}_ssl"
-fi
-
 if [ "${SOURCE_DB_TYPE}" = "oracle" ]
 then
 	source ${SCRIPTS}/${SOURCE_DB_TYPE}/live_env.sh
@@ -40,16 +35,6 @@ else
 	source ${SCRIPTS}/${SOURCE_DB_TYPE}/env.sh
 fi
 
-# export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')"
-# if [[ "${SOURCE_DB_TYPE}" == "postgresql" || "${SOURCE_DB_TYPE}" == "mysql" ]]; then
-#     export SOURCE_DB_NAME=${SOURCE_DB_NAME:-"${NORMALIZED_TEST_NAME}_fallb"}
-# elif [[ "${SOURCE_DB_TYPE}" == "oracle" ]]; then
-#     export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA:-"${NORMALIZED_TEST_NAME:0:10}_fallb"} && export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA^^}
-# else
-#     echo "ERROR: Unsupported SOURCE_DB_TYPE: ${SOURCE_DB_TYPE}"
-#     exit 1
-# fi
-
 source ${SCRIPTS}/functions.sh
 
 normalize_and_export_vars "fallb"
diff --git a/migtests/scripts/live-migration-fallf-run-test.sh b/migtests/scripts/live-migration-fallf-run-test.sh
index af6813e61..54dbe7bd7 100755
--- a/migtests/scripts/live-migration-fallf-run-test.sh
+++ b/migtests/scripts/live-migration-fallf-run-test.sh
@@ -37,22 +37,6 @@ else
     source ${SCRIPTS}/${SOURCE_DB_TYPE}/env.sh
 fi
 
-# export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')"
-# export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_fallf_export-dir"}
-# if [ -n "${SOURCE_DB_SSL_MODE}" ]; then
-#   EXPORT_DIR="${EXPORT_DIR}_ssl"
-# fi
-
-# if [[ "${SOURCE_DB_TYPE}" == "postgresql" || "${SOURCE_DB_TYPE}" == "mysql" ]]; then
-#     export SOURCE_DB_NAME=${SOURCE_DB_NAME:-"${NORMALIZED_TEST_NAME}_fallf"}
-# elif [[ "${SOURCE_DB_TYPE}" == "oracle" ]]; then
-#     export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA:-"${NORMALIZED_TEST_NAME:0:10}_fallf"} && export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA^^}
-# else
-#     echo "ERROR: Unsupported SOURCE_DB_TYPE: ${SOURCE_DB_TYPE}"
-#     exit 1
-# fi
-
-
 source ${SCRIPTS}/functions.sh
 
 normalize_and_export_vars "fallf"
@@ -80,7 +64,7 @@ main() {
 	if [ "${SOURCE_DB_TYPE}" = "oracle" ]
 	then
 		create_source_db ${SOURCE_DB_SCHEMA}
-		# TODO: Add dynamic Fall Forward schema creation
+		# TODO: Add dynamic Fall Forward schema creation. Currently using the same name for all tests.
 		create_source_db ${SOURCE_REPLICA_DB_SCHEMA}
 		run_sqlplus_as_sys ${SOURCE_REPLICA_DB_NAME} ${SCRIPTS}/oracle/create_metadata_tables.sql
 	fi
diff --git a/migtests/scripts/live-migration-run-test.sh b/migtests/scripts/live-migration-run-test.sh
index 2a5984965..98f99e6be 100755
--- a/migtests/scripts/live-migration-run-test.sh
+++ b/migtests/scripts/live-migration-run-test.sh
@@ -18,7 +18,6 @@ export REPO_ROOT="${PWD}"
 export SCRIPTS="${REPO_ROOT}/migtests/scripts"
 export TESTS_DIR="${REPO_ROOT}/migtests/tests"
 export TEST_DIR="${TESTS_DIR}/${TEST_NAME}"
-export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')"
 export QUEUE_SEGMENT_MAX_BYTES=400
 
 export PYTHONPATH="${REPO_ROOT}/migtests/lib"
@@ -37,20 +36,6 @@ else
 	source ${SCRIPTS}/${SOURCE_DB_TYPE}/env.sh
 fi
 
-# export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_live_export-dir"}
-# if [ -n "${SOURCE_DB_SSL_MODE}" ]; then
-#   EXPORT_DIR="${EXPORT_DIR}_ssl"
-# fi
-
-# if [[ "${SOURCE_DB_TYPE}" == "postgresql" || "${SOURCE_DB_TYPE}" == "mysql" ]]; then
-#     export SOURCE_DB_NAME=${SOURCE_DB_NAME:-"${NORMALIZED_TEST_NAME}_live"}
-# elif [[ "${SOURCE_DB_TYPE}" == "oracle" ]]; then
-#     export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA:-"${NORMALIZED_TEST_NAME:0:10}_live"} && export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA^^}
-# else
-#     echo "ERROR: Unsupported SOURCE_DB_TYPE: ${SOURCE_DB_TYPE}"
-#     exit 1
-# fi
-
 source ${SCRIPTS}/functions.sh
 
 normalize_and_export_vars "live"
diff --git a/migtests/scripts/run-test.sh b/migtests/scripts/run-test.sh
index bc4f57cbd..e40cc60d1 100755
--- a/migtests/scripts/run-test.sh
+++ b/migtests/scripts/run-test.sh
@@ -17,7 +17,6 @@ export REPO_ROOT="${PWD}"
 export SCRIPTS="${REPO_ROOT}/migtests/scripts"
 export TESTS_DIR="${REPO_ROOT}/migtests/tests"
 export TEST_DIR="${TESTS_DIR}/${TEST_NAME}"
-export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')"
 
 export PYTHONPATH="${REPO_ROOT}/migtests/lib"
 
@@ -36,19 +35,6 @@ fi
 
 source ${SCRIPTS}/${SOURCE_DB_TYPE}/env.sh
 
-# export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_offline_export-dir"}
-# if [ -n "${SOURCE_DB_SSL_MODE}" ]; then
-#   EXPORT_DIR="${EXPORT_DIR}_ssl"
-# fi
-
-# if [[ "${SOURCE_DB_TYPE}" == "postgresql" || "${SOURCE_DB_TYPE}" == "mysql" ]]; then
-#     export SOURCE_DB_NAME=${SOURCE_DB_NAME:-"${NORMALIZED_TEST_NAME}_offline"}
-# elif [[ "${SOURCE_DB_TYPE}" == "oracle" ]]; then
-#     export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA:-"${NORMALIZED_TEST_NAME:0:10}_offline"} && export SOURCE_DB_SCHEMA=${SOURCE_DB_SCHEMA^^}
-# else
-#     echo "ERROR: Unsupported SOURCE_DB_TYPE: ${SOURCE_DB_TYPE}"
-#     exit 1
-# fi
 
 source ${SCRIPTS}/functions.sh