diff --git a/pipelined/testbench/testbench.sv b/pipelined/testbench/testbench.sv
index d4874b617..95112fec8 100644
--- a/pipelined/testbench/testbench.sv
+++ b/pipelined/testbench/testbench.sv
@@ -326,7 +326,7 @@ logic [3:0] dummy;
             ProgramLabelMapFile = {pathname, tests[test], ".elf.objdump.lab"};
             ProgramAddrLabelArray = '{ "begin_signature" : 0, 
 	            	                       "tohost" : 0 };
-            updateProgramAddrLabelArray(.ProgramAddrMapFile(ProgramAddrMapFile), .ProgramLabelMapFile(ProgramLabelMapFile), .ProgramAddrLabelArray(ProgramAddrLabelArray));
+            updateProgramAddrLabelArray(ProgramAddrMapFile, ProgramLabelMapFile, ProgramAddrLabelArray);
             $display("Read memfile %s", memfilename);
             reset_ext = 1; # 47; reset_ext = 0;
         end
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index 35bf228d0..3e2ed6a0c 100644
--- a/tests/riscof/Makefile
+++ b/tests/riscof/Makefile
@@ -12,31 +12,6 @@ build:
 	riscof run --work-dir=$(work_dir) --config=config$(XLEN).ini --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser --no-dut-run
 	mv $(work_dir)/rv$(XLEN)i_m work/
 
-# buildold:
-# 	mkdir -p $(work_dir)
-# 	mkdir -p work
-# 	sed 's,{0},$(current_dir),g;s,{1},32imc,g' config.ini > config32.ini
-# 	sed 's,{0},$(current_dir),g;s,{1},64gc,g' config.ini > config64.ini
-# 	riscof run --work-dir=$(work_dir) --config=config32.ini --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser --no-dut-run
-# 	mv -r $(work_dir)/rv32i_m work/
-# 	riscof run --work-dir=$(work_dir) --config=config64.ini --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser --no-dut-run
-# 	mv -r $(work_dir)/rv64i_m work/
-
-# no-dut-run? do we want to run spike?
-# sed  >> config64.ini
-#	(cd $(arch_dir) && riscof validateyaml --config=config.ini)
-#	(cd $(arch_dir) && riscof --verbose info arch-test --clone)
-#	(cd $(arch_dir) && riscof testlist --config=config.ini --suite=riscv-arch-test/riscv-test-suite/ --env=riscv-arch-test/riscv-test-suite/env)
-# sed -i 's/riscv{.}-unknown-/riscv64-unknown-/g' $(arch_dir)/spike/riscof_spike.py
-# sed -i 's/riscv{.}-unknown-/riscv64-unknown-/g' $(arch_dir)/sail_cSim/riscof_sail_cSim.py
-
-# memfile:
-# 	sleep 1
-# # find work/rv*/*/ -type f -name "*ref.elf" | while read f; do riscv64-unknown-elf-objdump -S -D "$$f" > "$$f.objdump"; echo $$f; done
-# 	find work/rv32*/*/ -type f -name "*ref.elf" | while read f; do riscv64-unknown-elf-elf2hex --bit-width 32 --input "$$f" --output "$$f.memfile"; done
-# 	find work/rv64*/*/ -type f -name "*ref.elf" | while read f; do riscv64-unknown-elf-elf2hex --bit-width 64 --input "$$f" --output "$$f.memfile"; done
-# 	find work/rv*/*/ -type f -name "*.objdump" | while read f; do extractFunctionRadix.sh $$f; done
-
 clean:
 	rm -f config64.ini
 	rm -f config32.ini