diff --git a/riscv32-sim/src/main.cpp b/riscv32-sim/src/main.cpp
index 31a7f51..89d6bff 100644
--- a/riscv32-sim/src/main.cpp
+++ b/riscv32-sim/src/main.cpp
@@ -131,13 +131,13 @@ int run(options &opt) {
   while ((opt.fstep && std::cin.get() == 'q') || !model.done()) {
     model.step();
     auto &state = model.cur_state;
-    fmt::print("{}", state.dec);
-    auto log_changes = [](const auto &changes) {
-      std::for_each(changes.begin(), changes.end(),
-                    [](const auto &change) { spdlog::info("{}", change); });
-    };
-    log_changes(state.gpr_staged);
-    log_changes(state.csr_staged);
+    // fmt::print("{}", state.dec);
+    // auto log_changes = [](const auto &changes) {
+    //  std::for_each(changes.begin(), changes.end(),
+    //                [](const auto &change) { spdlog::info("{}", change); });
+    // };
+    // log_changes(state.gpr_staged);
+    // log_changes(state.csr_staged);
     if (!opt.disas_output.empty()) {
       static std::ofstream out(opt.disas_output);
       out << state;
@@ -150,8 +150,9 @@ int run(options &opt) {
     std::ofstream state_file(opt.json_output);
     state_file << state_export.dump();
   }
-  spdlog::info("{} Exited with 0x{:X} ({})", opt.target, model.tohost(),
-               static_cast<int32_t>(model.tohost()));
+  fmt::print("{} Exited with 0x{:X} ({})", opt.target, model.tohost(),
+             static_cast<int32_t>(model.tohost()));
+  // spdlog::info(");
 
   return 0;
 }
diff --git a/tools/build.sh b/tools/build.sh
index e3f4372..ff7a427 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -20,7 +20,7 @@ cmake -B $BUILD_DIR -GNinja \
   -DENABLE_TCP=ON \
   -DBUILD_RUNTIME=ON \
   -DTEST_EXPORT_JSON_HART_STATE=ON \
-  -DENABLE_UBENCHMARKS=ON
+  -DENABLE_UBENCHMARKS=OFF
   #-DBUILD_TESTING=OFF
 
 ninja -v -C $BUILD_DIR