diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
index 3920ff2975..31bd095bf8 100644
--- a/selfdrive/boardd/boardd.cc
+++ b/selfdrive/boardd/boardd.cc
@@ -113,19 +113,13 @@ bool safety_setter_thread(std::vector<Panda *> pandas) {
     return false;
   }
 
-//  // set to ELM327 for fingerprinting
-//  for (int i = 0; i < pandas.size(); i++) {
-//    const uint16_t safety_param = (i > 0) ? 1U : 0U;
-//    pandas[i]->set_safety_model(cereal::CarParams::SafetyModel::ELM327, safety_param);
-//  }
-
-  // wait for FW query at OBD port to finish
+  // openpilot can switch between multiplexing modes for different FW queries,
+  // set to ELM327 and wait for FW query to finish
   while (true) {
     if (do_exit || !check_all_connected(pandas) || !ignition) {
       return false;
     }
 
-    // set to ELM327 for fingerprinting, multiplexing is controlled by a param
     bool obd_multiplexing_requested = p.getBool("ObdMultiplexingRequested");
     if (obd_multiplexing_requested != p.getBool("ObdMultiplexingEnabled")) {
       for (int i = 0; i < pandas.size(); i++) {
@@ -142,13 +136,6 @@ bool safety_setter_thread(std::vector<Panda *> pandas) {
     util::sleep_for(20);
   }
 
-//  // set to ELM327 to finish fingerprinting and for potential ECU knockouts
-//  for (Panda *panda : pandas) {
-//    panda->set_safety_model(cereal::CarParams::SafetyModel::ELM327, 1U);
-//  }
-//
-//  p.putBool("ObdMultiplexingDisabled", true);
-
   std::string params;
   LOGW("waiting for params to set safety model");
   while (true) {