diff --git a/common.mk b/common.mk
index ded40c5e..609fbf49 100644
--- a/common.mk
+++ b/common.mk
@@ -194,7 +194,7 @@ endif
 		--disable-annotation-classless \
 		--disable-annotation-unknown \
 		--mlir-timing \
-		--lowering-options=emittedLineLength=2048,noAlwaysComb,disallowPackedArrays,disallowLocalVariables,verifLabels,locationInfoStyle=wrapInAtSquareBracket \
+		--lowering-options=emittedLineLength=2048,noAlwaysComb,disallowLocalVariables,verifLabels,locationInfoStyle=wrapInAtSquareBracket \
 		--repl-seq-mem \
 		--repl-seq-mem-file=$(MFC_SMEMS_CONF) \
 		--repl-seq-mem-circuit=$(MODEL) \
diff --git a/conda-requirements-riscv-tools.yaml b/conda-requirements-riscv-tools.yaml
deleted file mode 100644
index 131c3ef5..00000000
--- a/conda-requirements-riscv-tools.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-channels:
-    - ucb-bar
-    - conda-forge
-    - nodefaults
-
-dependencies:
-    # https://conda-forge.org/feedstock-outputs/
-    #   filterable list of all conda-forge packages
-    # https://conda-forge.org/#contribute
-    #   instructions on adding a recipe
-    # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
-    #   documentation on package_spec syntax for constraining versions
-
-
-    # handy tool for introspecting package relationships and file ownership
-    # see https://github.com/rvalieris/conda-tree
-    - conda-tree
-
-    # bundle FireSim driver with deps into installer shell-script
-    - constructor
-
-    - gcc
-    - gxx
-    - sysroot_linux-64>=2.17 # needed to match pre-built CI XRT glibc version
-    - conda-gcc-specs
-    - binutils
-
-    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
-    - riscv-tools=1.0.1 # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
-    - firtool # from ucb-bar channel - https://github.com/ucb-bar/firtool-feedstock
-
-    # firemarshal deps
-    - python>=3.8
-    - bc
-    - patch
-    - which
-    - diffutils
-    - bash
-    - gzip
-    - bzip2
-    - perl
-    - tar
-    - file
-    - findutils
-    - rsync
-    - psutil
-    - doit=0.35.0
-    - gitpython
-    - humanfriendly
-    - e2fsprogs
-    - ctags
-    - bison
-    - flex
-    - expat
-    - make
-    - pyyaml
-    - unzip
-    - readline
-    - coreutils
-    - lzop
-    - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
-
-    - jq
-    - bash-completion
-    - sbt
-    - ca-certificates
-    - mosh
-    - gmp
-    - mpfr
-    - mpc
-    - zlib
-    - vim
-    - git
-    - openjdk
-    - gengetopt
-    - libffi
-    - expat
-    - libusb1
-    - ncurses
-    - cmake
-    - graphviz
-    - expect
-    - dtc
-    - verilator==4.226
-    - screen
-    - elfutils
-    - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
-    - conda-lock>=1
-    - wget
-    - sed
-    - autoconf
-
-    # clang-format for driver coding style enforcement.
-    - clang-format
-    - clang-tools
-
-    # python packages
-    # While it is possible to install using pip after creating the
-    # conda environment, pip's dependency resolution can conflict with
-    # conda and create broken environments.  It's best to use the conda
-    # packages so that the environment is consistent
-    - boto3==1.20.21
-    - colorama==0.4.3
-    - argcomplete==1.12.3
-    - python-graphviz==0.19
-    - pyparsing==3.0.6
-    - numpy==1.19.5
-    - kiwisolver==1.3.1
-    - matplotlib-base==3.3.4
-    - pandas==1.1.5
-    - awscli==1.22.21
-    - pytest==6.2.5
-    - pytest-dependency==0.5.1
-    - pytest-mock==3.7.0
-    - moto==3.1.0
-    - pyyaml==5.4.1
-    - mypy==0.931
-    - types-pyyaml==6.0.4
-    - boto3-stubs==1.21.6
-    - botocore-stubs==1.24.7
-    - mypy-boto3-s3==1.21.0
-    - pip
-    - pip:
-        - fab-classic==1.19.1
-        - mypy-boto3-ec2==1.21.9
-        - sure==2.0.0
-        - pylddwrap==1.2.1
-
-    # doc requirements
-    - sphinx
-    - pygments
-    - sphinx-autobuild
-    - sphinx_rtd_theme
-    - docutils
diff --git a/tools/barstools b/tools/barstools
index 653989c0..9760528f 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit 653989c092eef55059e4720523927d52d43ffebf
+Subproject commit 9760528f1de2b1a52a11476e76d25909b31d1def