diff --git a/.circleci/config.yml b/.circleci/config.yml
index e53ccca880..5f53df2aa3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ jobs:
       - *checkout
       - *setup_env
       - run:
-          name: "Test"
+          name: "Build and test"
           command: build sol
 
   barretenberg-tests:
diff --git a/build_manifest.json b/build_manifest.json
index fcedadbae5..9d94b0fb32 100644
--- a/build_manifest.json
+++ b/build_manifest.json
@@ -31,7 +31,7 @@
   },
   "sol": {
     "buildDir": "sol",
-    "dockerfile": "sol/Dockerfile",
+    "dockerfile": "Dockerfile",
     "rebuildPatterns": ["^sol/"],
     "dependencies": ["barretenberg-x86_64-linux-clang-assert"]
   }
diff --git a/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp b/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
index 1de3ab3c59..99f443faf4 100644
--- a/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
+++ b/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
@@ -3,13 +3,6 @@
 #include "barretenberg/stdlib/primitives/uint/uint.hpp"
 #include "barretenberg/stdlib/primitives/bool/bool.hpp"
 
-// #include <stdlib/primitives/field/field.hpp>
-// #include <stdlib/primitives/witness/witness.hpp>
-// #include <stdlib/primitives/uint/uint.hpp>
-// #include <stdlib/primitives/bool/bool.hpp>
-
-// using numeric::uint256_t;
-
 template <typename Composer> class Add2Circuit {
   public:
     typedef stdlib::field_t<Composer> field_ct;
diff --git a/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp b/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
index a41a3c98a4..1b19bd8b3b 100644
--- a/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
+++ b/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
@@ -2,10 +2,6 @@
 #include "barretenberg/stdlib/primitives/witness/witness.hpp"
 #include "barretenberg/stdlib/hash/blake2s/blake2s.hpp"
 
-//#include <stdlib/primitives/field/field.hpp>
-//#include <stdlib/primitives/witness/witness.hpp>
-//#include <stdlib/hash/blake2s/blake2s.hpp>
-
 using namespace proof_system::plonk;
 using namespace proof_system::plonk::stdlib;
 
diff --git a/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
index 64f17220c7..077427af51 100644
--- a/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
+++ b/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
@@ -6,14 +6,6 @@
 #include "barretenberg/ecc/curves/bn254/fq12.hpp"
 #include "barretenberg/ecc/curves/bn254/pairing.hpp"
 
-//#include <transcript/transcript.hpp>
-//#include <proof_system/proving_key/serialize.hpp>
-//#include <stdlib/primitives/curves/bn254.hpp>
-//#include <stdlib/recursion/verifier/verifier.hpp>
-//#include <stdlib/recursion/verifier/program_settings.hpp>
-//#include <ecc/curves/bn254/fq12.hpp>
-//#include <ecc/curves/bn254/pairing.hpp>
-
 using namespace proof_system::plonk;
 
 using numeric::uint256_t;
diff --git a/cpp/src/barretenberg/solidity_helpers/key_gen.cpp b/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
index cd34f70e45..86913a0d92 100644
--- a/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
+++ b/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
@@ -17,10 +17,6 @@ void generate_keys(std::string output_path, std::string srs_path, std::string fl
     uint256_t public_inputs[4] = { 0, 0, 0, 0 };
     Composer composer = Circuit::generate(srs_path, public_inputs);
 
-    (void)output_path;
-    (void)flavour_prefix;
-    (void)circuit_name;
-
     std::shared_ptr<plonk::verification_key> vkey = composer.compute_verification_key();
 
     // Make verification key file upper case
@@ -55,12 +51,6 @@ void generate_keys(std::string output_path, std::string srs_path, std::string fl
 int main(int argc, char** argv)
 {
     std::vector<std::string> args(argv, argv + argc);
-    // if (args.size() < 3)
-    // {
-    //     info(
-    //         "usage: ", args[0], "[path to project root] [srs path]");
-    //     return 1;
-    // }
 
     if (args.size() < 5) {
         info("usage: ", args[0], "[plonk flavour] [circuit flavour] [output path] [srs path]");
@@ -72,9 +62,6 @@ int main(int argc, char** argv)
     const std::string output_path = args[3];
     const std::string srs_path = args[4];
 
-    // const std::string standard_path = project_root_path + "/src/standard";
-    // const std::string ultra_path = project_root_path + "/src/ultra";
-
     // @todo - Add support for unrolled standard verifier. Needs a new solidity verifier contract.
 
     if (plonk_flavour != "ultra") {
diff --git a/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp b/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp
index 4e7046c809..0567e73739 100644
--- a/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp
+++ b/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp
@@ -1,10 +1,6 @@
 #include <iostream>
 #include <bitset>
 
-// TODO Remove
-// const std::string DEFAULT_PROJECT_ROOT_PATH = "../..";
-// const std::string DEFAULT_SRS_PATH = "../../barretenberg/cpp/srs_db/ignition";
-
 std::string bytes_to_hex_string(const std::vector<uint8_t>& input)
 {
     static const char characters[] = "0123456789ABCDEF";