diff --git a/get.sh b/get.sh
index a14927882a..2afe60014b 100755
--- a/get.sh
+++ b/get.sh
@@ -660,7 +660,9 @@ getFunctionalTestMaterial()
 		mv openj9/test/functional functional
 	fi
 
-	rm -rf openj9
+	cd openj9
+	find . -mindepth 1 ! -name ".git" ! -path "./.git/*" -exec rm -rf {} +
+	cd $TESTDIR
 }
 
 getVendorTestMaterial() {
@@ -745,7 +747,10 @@ getVendorTestMaterial() {
 		fi
 
 		# clean up
-		rm -rf $dest
+		cd $dest
+		find . -mindepth 1 ! -name ".git" ! -path "./.git/*" -exec rm -rf {} +
+		cd $TESTDIR
+
 	done
 }
 
@@ -807,11 +812,8 @@ testJavaVersion()
 
 checkRepoSHA()
 {
-	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
 }