diff --git a/get.sh b/get.sh
index 81d299c7ff..a14927882a 100755
--- a/get.sh
+++ b/get.sh
@@ -570,7 +570,6 @@ getTestKitGen()
 	echo "git checkout -q -f $tkg_sha"
 	git checkout -q -f $tkg_sha
 
-	checkTestRepoSHAs
 }
 
 getCustomJtreg()
@@ -660,6 +659,8 @@ getFunctionalTestMaterial()
 	else
 		mv openj9/test/functional functional
 	fi
+
+	rm -rf openj9
 }
 
 getVendorTestMaterial() {
@@ -742,6 +743,9 @@ getVendorTestMaterial() {
 			# already in TESTDIR, thus copy the entire vendor repo content to current directory
 			cp -r $dest/* ./
 		fi
+
+		# clean up
+		rm -rf $dest
 	done
 }
 
@@ -803,26 +807,15 @@ testJavaVersion()
 
 checkRepoSHA()
 {
-	testenv_file="$TESTDIR/testenv/testenv.properties"
+	sha_file="$TESTDIR/TKG/SHAs.txt"
+	echo "$TESTDIR/TKG/scripts/getSHAs.sh --repo_dir $1 --output_file $sha_file"
+	$TESTDIR/TKG/scripts/getSHAs.sh --test_root_dir $1 --shas_file $sha_file
 
+	testenv_file="$TESTDIR/testenv/testenv.properties"
 	echo "$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2"
 	$TESTDIR/TKG/scripts/getTestenvProperties.sh --repo_dir $1 --output_file $testenv_file --repo_name $2
 }
 
-checkTestRepoSHAs()
-{
-	echo "check adoptium repo and TKG repo SHA"
-
-	output_file="$TESTDIR/TKG/SHA.txt"
-	if [ -e ${output_file} ]; then
-		echo "rm $output_file"
-		rm ${output_file}
-	fi
-
-	checkRepoSHA "$TESTDIR" "ADOPTOPENJDK"
-	checkRepoSHA "$TESTDIR/TKG" "TKG"
-}
-
 checkOpenJ9RepoSHA()
 {
 	echo "check OpenJ9 Repo sha"