diff --git a/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh b/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh
index 50cf755990a..7c9192fa3f7 100755
--- a/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh
+++ b/barretenberg/cpp/scripts/compare_branch_vs_baseline_remote.sh
@@ -10,7 +10,7 @@
 # it is up to date with local master, and run the script.
 
 # Specify the benchmark suite and the "baseline" branch against which to compare
-BENCHMARK=${1:-client_ivc_bench}
+BENCHMARK=${1:-goblin_bench}
 FILTER=${2:-"*."}
 PRESET=${3:-clang16}
 BUILD_DIR=${4:-build}
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
index 3000fe4aa25..ff35d3dff5c 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
@@ -70,8 +70,7 @@ template <typename Fr> Polynomial<Fr>::Polynomial(size_t size, size_t virtual_si
     size_t leftovers = size - (range_per_thread * num_threads);
     parallel_for(num_threads, [&](size_t j) {
         size_t offset = j * range_per_thread;
-        size_t range = (j == num_threads - 1) ? range_per_thread + leftovers // Last thread processes extra elements
-                                              : range_per_thread;
+        size_t range = (j == num_threads - 1) ? range_per_thread + leftovers : range_per_thread;
         ASSERT(offset < size);
         ASSERT((offset + range) <= size);
         memset(static_cast<void*>(coefficients_.backing_memory_.get() + offset), 0, sizeof(Fr) * range);
diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
index 8e759b7026c..2d265463f07 100644
--- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
+++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
@@ -69,9 +69,7 @@ template <typename Fr> class Polynomial {
     // Intended just for plonk, where size == virtual_size always
     Polynomial(size_t size)
         : Polynomial(size, size)
-    {
-        PROFILE_THIS_NAME("Polynomial allocation");
-    }
+    {}
     // Constructor that does not initialize values, use with caution to save time.
     Polynomial(size_t size, size_t virtual_size, size_t start_index, DontZeroMemory flag);
     Polynomial(size_t size, size_t virtual_size, DontZeroMemory flag)
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_flavor.hpp
index dcea8842e23..e87ebe9ea76 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_flavor.hpp
@@ -417,7 +417,6 @@ class MegaFlavor {
 
         void set_shifted()
         {
-            PROFILE_THIS_NAME("set shifted");
             for (auto [shifted, to_be_shifted] : zip_view(get_shifted(), get_to_be_shifted())) {
                 shifted = to_be_shifted.shifted();
             }
diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp
index 6acee723417..d8be56ad096 100644
--- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp
+++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_flavor.hpp
@@ -340,8 +340,6 @@ class UltraFlavor {
         // Set all shifted polynomials based on their to-be-shifted counterpart
         void set_shifted()
         {
-            PROFILE_THIS_NAME("set shifted");
-
             for (auto [shifted, to_be_shifted] : zip_view(get_shifted(), get_to_be_shifted())) {
                 shifted = to_be_shifted.shifted();
             }
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/decider_proving_key.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/decider_proving_key.hpp
index 2e322f9b8b2..05797f2708c 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/decider_proving_key.hpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/decider_proving_key.hpp
@@ -99,8 +99,6 @@ template <IsUltraFlavor Flavor> class DeciderProvingKey_ {
             PROFILE_THIS_NAME("allocating proving key");
 
             proving_key = ProvingKey(dyadic_circuit_size, circuit.public_inputs.size(), commitment_key);
-            info("dyadic circuit size: ", dyadic_circuit_size);
-            info("proving_key.circuit_size ", proving_key.circuit_size);
             // If not using structured trace OR if using structured trace but overflow has occurred (overflow block in
             // use), allocate full size polys
             if ((IsMegaFlavor<Flavor> && !is_structured) || (is_structured && circuit.blocks.has_overflow)) {
@@ -138,6 +136,7 @@ template <IsUltraFlavor Flavor> class DeciderProvingKey_ {
                 }
                 {
                     PROFILE_THIS_NAME("allocating non-gate selectors");
+
                     // Set the other non-gate selector polynomials to full size
                     for (auto& selector : proving_key.polynomials.get_non_gate_selectors()) {
                         selector = Polynomial(proving_key.circuit_size);
@@ -262,7 +261,6 @@ template <IsUltraFlavor Flavor> class DeciderProvingKey_ {
                         /* size=*/dyadic_circuit_size, /*virtual size=*/dyadic_circuit_size, /*start_idx=*/0);
                 }
             }
-
             // We can finally set the shifted polynomials now that all of the to_be_shifted polynomials are
             // defined.
             proving_key.polynomials.set_shifted(); // Ensure shifted wires are set correctly
diff --git a/l1-contracts/lib/forge-std b/l1-contracts/lib/forge-std
index 0e709775091..75f1746c949 160000
--- a/l1-contracts/lib/forge-std
+++ b/l1-contracts/lib/forge-std
@@ -1 +1 @@
-Subproject commit 0e7097750918380d84dd3cfdef595bee74dabb70
+Subproject commit 75f1746c949ae56377611e5f2128aa93d381431f
diff --git a/l1-contracts/lib/openzeppelin-contracts b/l1-contracts/lib/openzeppelin-contracts
index 448efeea664..7222a31d548 160000
--- a/l1-contracts/lib/openzeppelin-contracts
+++ b/l1-contracts/lib/openzeppelin-contracts
@@ -1 +1 @@
-Subproject commit 448efeea6640bbbc09373f03fbc9c88e280147ba
+Subproject commit 7222a31d548695998a475c9661fa159ef45a0e88