diff --git a/include/openmc/output.h b/include/openmc/output.h
index 117f75148..439820bd3 100644
--- a/include/openmc/output.h
+++ b/include/openmc/output.h
@@ -46,10 +46,6 @@ void print_columns();
 //! Display information about a generation of neutrons
 void print_generation();
 
-//! \brief Display last batch's tallied value of the neutron multiplication
-//! factor as well as the average value if we're in active batches
-void print_batch_keff();
-
 //! Display time elapsed for various stages of a run
 void print_runtime();
 
diff --git a/src/output.cpp b/src/output.cpp
index 8da32de55..96aec69d9 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -191,6 +191,7 @@ extern "C" void print_particle(Particle* p)
 
   // Display miscellaneous info.
   if (p->surface_ != 0) {
+    // Surfaces identifiers are >= 1, but indices are >= 0 so we need -1
     const Surface& surf {*model::surfaces[std::abs(p->surface_)-1]};
     fmt::print("  Surface = {}\n", (p->surface_ > 0) ? surf.id_ : -surf.id_);
   }
@@ -280,7 +281,7 @@ print_overlap_check()
 
     std::vector<int32_t> sparse_cell_ids;
     for (int i = 0; i < model::cells.size(); i++) {
-      fmt::print(" {:8}{:17}\n", model::cells[i]->id_, model::overlap_check_count[i]);
+      fmt::print(" {:8} {:17}\n", model::cells[i]->id_, model::overlap_check_count[i]);
       if (model::overlap_check_count[i] < 10) {
         sparse_cell_ids.push_back(model::cells[i]->id_);
       }
@@ -352,43 +353,19 @@ void print_columns()
 
 void print_generation()
 {
-  // Determine overall generation and number of active generations
-  int i = overall_generation() - 1;
+  // Determine overall generation index and number of active generations
+  int idx = overall_generation() - 1;
   int n = simulation::current_batch > settings::n_inactive ?
     settings::gen_per_batch*simulation::n_realizations + simulation::current_gen : 0;
 
-  // write out information batch and option independent output
+  // write out batch/generation and generation k-effective
   auto batch_and_gen = std::to_string(simulation::current_batch) + "/" +
     std::to_string(simulation::current_gen);
-  fmt::print("  {:>9}   {:8.5f}", batch_and_gen, simulation::k_generation[i]);
+  fmt::print("  {:>9}   {:8.5f}", batch_and_gen, simulation::k_generation[idx]);
 
   // write out entropy info
   if (settings::entropy_on) {
-    fmt::print("   {:8.5f}", simulation::entropy[i]);
-  }
-
-  if (n > 1) {
-    fmt::print("   {:8.5f} +/-{:8.5f}", simulation::keff, simulation::keff_std);
-  }
-  std::cout << std::endl;
-}
-
-//==============================================================================
-
-void print_batch_keff()
-{
-  // Determine overall generation and number of active generations
-  int i = simulation::current_batch*settings::gen_per_batch - 1;
-  int n = simulation::n_realizations*settings::gen_per_batch;
-
-  // write out information batch and option independent output
-  auto batch_and_gen = std::to_string(simulation::current_batch) + "/" +
-    std::to_string(settings::gen_per_batch);
-  fmt::print("  {:>9}   {:8.5f}", batch_and_gen, simulation::k_generation[i]);
-
-  // write out entropy info
-  if (settings::entropy_on) {
-    fmt::print("   {:8.5f}", simulation::entropy[i]);
+    fmt::print("   {:8.5f}", simulation::entropy[idx]);
   }
 
   if (n > 1) {
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 0a234e53f..4da79ce53 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -345,11 +345,6 @@ void finalize_batch()
     simulation::n_realizations = 0;
   }
 
-  if (settings::run_mode == RunMode::EIGENVALUE) {
-    // Write batch output
-    if (mpi::master && settings::verbosity >= 7) print_batch_keff();
-  }
-
   // Check_triggers
   if (mpi::master) check_triggers();
 #ifdef OPENMC_MPI
@@ -442,9 +437,7 @@ void finalize_generation()
 
     // Write generation output
     if (mpi::master && settings::verbosity >= 7) {
-      if (simulation::current_gen != settings::gen_per_batch) {
-        print_generation();
-      }
+      print_generation();
     }
 
   }