diff --git a/Makefile b/Makefile
index 1c67aad38..b3a054e49 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,20 @@ all:
 	make regression
 
 # install copies over the Makefile.include from riscv-isa-sim
-# And corrects the TARGETDIR path and the RISCV_PREFIXZ
+# And corrects the TARGETDIR path and the RISCV_PREFIX
 
 install:
-	cp ${RISCV}/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
-	sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target' addins/riscv-arch-test/Makefile.include
-	echo export RISCV_PREFIX = riscv64-unknown-elf- >> addins/riscv-arch-test/Makefile.include
-	#cd tests/linux-testgen/linux-testvectors; source ./tvLinker.sh # needs to be run in local directory
-	#rm tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
-	#ln -s ${RISCV}/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
+	# *** 1/15/23 dh: check if any of this is still needed
+	#cp ${RISCV}/riscv-isa-sim/arch_test_target/spike/Makefile.include addins/riscv-arch-test/
+	#sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target' addins/riscv-arch-test/Makefile.include
+	#echo export RISCV_PREFIX = riscv64-unknown-elf- >> addins/riscv-arch-test/Makefile.include
+	##cd tests/linux-testgen/linux-testvectors; source ./tvLinker.sh # needs to be run in local directory
+	##rm tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
+	##ln -s ${RISCV}/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe tests/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64/riscvOVPsimPlus.exe
 
 regression:
 	make -C pipelined/regression
 
 clean:
 	make clean -C pipelined/regression
-	
 
diff --git a/pipelined/regression/Makefile b/pipelined/regression/Makefile
index f15013280..adc7bc718 100644
--- a/pipelined/regression/Makefile
+++ b/pipelined/regression/Makefile
@@ -11,8 +11,7 @@ all: riscoftests memfiles
 	#make -C ../../addins/imperas-riscv-tests XLEN=64
 	#cd ../../addins/imperas-riscv-tests; elf2hex.sh
 	#cd ../../addins/imperas-riscv-tests; extractFunctionRadix.sh work/*/*/*.elf.objdump
-
-	# Link Linux test vectors (fix this later***)
+	# Link Linux test vectors 
 	#cd ../../tests/linux-testgen/linux-testvectors/;./tvLinker.sh
 
 allclean: clean all
@@ -25,9 +24,5 @@ clean:
 riscoftests: 
 # 	Builds riscv-arch-test 64 and 32-bit versions and builds wally-riscv-arch-test 64 and 32-bit versions
 	make -C ../../tests/riscof/ 
-#	make -C ../../tests/riscof/ XLEN=32
-#	make -C ../../tests/riscof/ XLEN=32 build_rv32e
-#	make -C ../../tests/riscof/ XLEN=64
-
 memfiles:
 	make -f makefile-memfile wally-sim-files --jobs
diff --git a/setup.sh b/setup.sh
index e2c1b6d6d..4d9e69106 100755
--- a/setup.sh
+++ b/setup.sh
@@ -11,6 +11,14 @@ WALLY=$(dirname ${BASH_SOURCE[0]:-$0})
 export WALLY=$(cd "$WALLY" && pwd)
 echo \$WALLY set to ${WALLY}
 
+# License servers and commercial CAD tool paths
+# Must edit these based on your local environment.  Ask your sysadmin.
+export MGLS_LICENSE_FILE=1717@solidworks.eng.hmc.edu                # Change this to your Siemens license server
+export SNPSLMD_LICENSE_FILE=27020@134.173.38.184                    # Change this to your Synopsys license server
+export PATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin:$PATH     # Change this for your path to Questa
+export PATH=/cad/synopsys/SYN/bin:$PATH                             # Change this for your path to Design Compiler
+
+
 # Path to RISC-V Tools
 export RISCV=/opt/riscv   # change this if you installed the tools in a different location
 
@@ -27,11 +35,6 @@ export PATH=$WALLY/bin:$PATH
 export PATH=/usr/local/bin/verilator:$PATH # Change this for your path to Verilator
 # ModelSim/Questa (vsim)
 # Note: 2022.1 complains on cache/sram1p1r1w about StoredData cannot be driven by multiple always_ff blocks.  Ues 2021.2 for now
-export PATH=/cad/mentor/questa_sim-2022.1_1/questasim/bin:$PATH    # Change this for your path to Modelsim 
-export PATH=/cad/mentor/questa_sim-2021.2_1/questasim/bin:$PATH    # Change this for your path to Modelsim, or delete
-export MGLS_LICENSE_FILE=1717@solidworks.eng.hmc.edu # Change this to your Siemens license server
-export PATH=/cad/synopsys/SYN/bin:$PATH  # Change this for your path to Design Compiler
-export SNPSLMD_LICENSE_FILE=27020@134.173.38.184 # Change this to your license manager file
 
 # Imperas; put this in if you are using it
 #export PATH=$RISCV/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64:$PATH