diff --git a/flist/sha-2-accelerator_src.flist b/flist/sha-2-accelerator_src.flist
index a9b8ef4c05f82773e00db0bfb9d6af21ddbfb0c0..a41fb419aa62f87720703a1ad52abccff62be014 100644
--- a/flist/sha-2-accelerator_src.flist
+++ b/flist/sha-2-accelerator_src.flist
@@ -16,18 +16,18 @@
 +libext+.v+.vlib
 
 // =============    Accelerator Module search path    =============
--y $DESIGN/sha-2-accelerator/hdl/src/
-+incdir+$DESIGN/sha-2-accelerator/hdl/src/
+-y ${ACC_ENGINE_DIR}/hdl/src/
++incdir+${ACC_ENGINE_DIR}/hdl/src/
 
-$DESIGN/sha-2-accelerator/hdl/src/fifo_vr.sv
-$DESIGN/sha-2-accelerator/hdl/src/sha256_hash_compression.sv
-$DESIGN/sha-2-accelerator/hdl/src/sha256_hashing_stream.sv
-$DESIGN/sha-2-accelerator/hdl/src/sha256_message_build.sv
+${ACC_ENGINE_DIR}/hdl/src/fifo_vr.sv
+${ACC_ENGINE_DIR}/hdl/src/sha256_hash_compression.sv
+${ACC_ENGINE_DIR}/hdl/src/sha256_hashing_stream.sv
+${ACC_ENGINE_DIR}/hdl/src/sha256_message_build.sv
 
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_1_3_arbitrator.sv
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_config_sync.sv
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_engine.sv
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_id_buf.sv
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_id_issue.sv
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_id_validator.sv
-// $DESIGN/sha-2-accelerator/hdl/src/sha256_packet_manager.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_1_3_arbitrator.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_config_sync.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_engine.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_id_buf.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_id_issue.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_id_validator.sv
+// ${ACC_ENGINE_DIR}/hdl/src/sha256_packet_manager.sv
diff --git a/flow/simulators/ivlog_sim.sh b/flow/simulators/ivlog_sim.sh
deleted file mode 100755
index cf3859b29d48b39e45ed9dd72330e72d806ac916..0000000000000000000000000000000000000000
--- a/flow/simulators/ivlog_sim.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#-----------------------------------------------------------------------------
-# SoC Labs icarus verilog simulation script for engine testbench
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2022, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-#!/usr/bin/env bash
-
-mkdir -p $SOC_TOP_DIR/simulate/sim/ 
-iverilog -I $SOC_TOP_DIR/hdl/verif/ -I $SOC_TOP_DIR/hdl/src/ -g2012 -o $SOC_TOP_DIR/simulate/sim/$1.vvp $SOC_TOP_DIR/hdl/verif/tb_$1.sv
-cd $SOC_TOP_DIR/simulate/sim/ && vvp $1.vvp $2
\ No newline at end of file
diff --git a/flow/socsim b/flow/socsim
deleted file mode 100755
index 4b2d7f1bc9db2453e218a5bc01beaee19b3248c0..0000000000000000000000000000000000000000
--- a/flow/socsim
+++ /dev/null
@@ -1,18 +0,0 @@
-#-----------------------------------------------------------------------------
-# SoC Labs socsim script to run required simulation
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2022, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-#!/usr/bin/env bash
-
-DEFAULT_SIMULATOR="ivlog"
-if [[ -z "${SIMULATOR}" ]]; then 
-    SIMULATOR=$DEFAULT_SIMULATOR
-fi
-$SOC_TOP_DIR"/flow/simulators/"$SIMULATOR"_sim.sh" $@
diff --git a/flow/socsim_py b/flow/socsim_py
deleted file mode 100755
index 4b0ba335f98e87a8e94bf539750adfb1d6d09e09..0000000000000000000000000000000000000000
--- a/flow/socsim_py
+++ /dev/null
@@ -1,14 +0,0 @@
-#-----------------------------------------------------------------------------
-# SoC Labs socsim script to run required simulation
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2022, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-#!/usr/bin/env bash
-
-python3 $ACC_ENGINE_DIR"/flow/socsim_py.py" $@
\ No newline at end of file
diff --git a/flow/socsim_py.py b/flow/socsim_py.py
deleted file mode 100644
index a3246b77b4bad58895c926f3cdcdf8142203c2d3..0000000000000000000000000000000000000000
--- a/flow/socsim_py.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#-----------------------------------------------------------------------------
-# SoC Labs socsim script to run required simulation
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2022, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-import argparse
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-m", "--model", type=str, help="Python Model used to generate Sitmulus and Reference for design")
-parser.add_argument("-s", "--stimulus", type=str, help="Stimulus to pass to Python Model to generate Testbench Stimulus and Reference")
-parser.parse_args()
\ No newline at end of file