diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1c9a6801e9c..7679ca97f30 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,8 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "port": 9229,
+      "address": "${config:mainframeAddress}",
+      "port": 9221,
       "type": "node",
       "request": "attach",
       "name": "Attach to Remote",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1df0f7fc2e0..6bde2bae40a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -120,7 +120,7 @@
     "editor.defaultFormatter": "hashicorp.terraform"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/barretenberg/.vscode/launch.json b/barretenberg/.vscode/launch.json
deleted file mode 100644
index 5ea1dbb1227..00000000000
--- a/barretenberg/.vscode/launch.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "LLDB: Prove Ultra Honk Output All",
-            "type": "lldb",
-            "request": "launch",
-            "program": "/mnt/user-data/adam/aztec-packages/barretenberg/cpp/build-debug/bin/bb",
-            "args": [
-                "prove_ultra_honk_output_all",
-                "-o", "/tmp/bb-095XQV/tmp-PPXk0y",
-                "-b", "/tmp/bb-095XQV/tmp-PPXk0y/PrivateKernelInitArtifact-bytecode",
-                "-w", "/tmp/bb-095XQV/tmp-PPXk0y/witness.gz",
-                "-v"
-            ],
-            "cwd": "${workspaceFolder}",
-            "stopOnEntry": false
-        }
-    ]
-}
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
index 3c1fa44785a..f1814970b3a 100644
--- a/barretenberg/cpp/src/barretenberg/bb/main.cpp
+++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp
@@ -245,11 +245,6 @@ bool proveAndVerifyHonkProgram(const std::string& bytecodePath, const std::strin
     return true;
 }
 
-struct VectorOfAcirAndWitnesses {
-    std::vector<std::vector<uint8_t>> acirGzippedBincoes;
-    std::vector<std::map<uint8_t, std::string>> witnessMaps;
-};
-
 // TODO(#7371): this could probably be more idiomatic
 template <typename T> T unpack_from_file(const std::string& filename)
 {
diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/arithmetization/arithmetization.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/arithmetization/arithmetization.hpp
index be21ac1c430..67b0fc18036 100644
--- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/arithmetization/arithmetization.hpp
+++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/arithmetization/arithmetization.hpp
@@ -353,12 +353,12 @@ template <typename FF_> class UltraHonkArith {
         // needs to be more dynamic. Sizes currently set to accommodate the full e2e test.
         std::array<uint32_t, 10> fixed_block_sizes{
             1 << 10, // ecc_op;
-            30000,   // pub_inputs;
-            755000,  // arithmetic;
+            5000,    // pub_inputs;
+            600000,  // arithmetic;
             140000,  // delta_range;
-            600000,  // elliptic;
-            1400000, // aux;
-            460000,  // lookup;
+            425000,  // elliptic;
+            1050000, // aux;
+            275000,  // lookup;
             1 << 7,  // busread;
             15000,   // poseidon_external;
             85000    // poseidon_internal;