diff --git a/y2019/control_loops/drivetrain/drivetrain_main.cc b/y2019/control_loops/drivetrain/drivetrain_main.cc
index cbc65e0..53e2bf5 100644
--- a/y2019/control_loops/drivetrain/drivetrain_main.cc
+++ b/y2019/control_loops/drivetrain/drivetrain_main.cc
@@ -22,6 +22,5 @@
 
   event_loop.Run();
 
-  ::aos::Cleanup();
   return 0;
 }
diff --git a/y2019/control_loops/drivetrain/drivetrain_replay.cc b/y2019/control_loops/drivetrain/drivetrain_replay.cc
index 4f40d75..3689970 100644
--- a/y2019/control_loops/drivetrain/drivetrain_replay.cc
+++ b/y2019/control_loops/drivetrain/drivetrain_replay.cc
@@ -58,6 +58,5 @@
 
   reader.event_loop_factory()->Run();
 
-  aos::Cleanup();
   return 0;
 }
diff --git a/y2019/control_loops/drivetrain/replay_localizer.cc b/y2019/control_loops/drivetrain/replay_localizer.cc
index 93282c8..de28317 100644
--- a/y2019/control_loops/drivetrain/replay_localizer.cc
+++ b/y2019/control_loops/drivetrain/replay_localizer.cc
@@ -403,5 +403,5 @@
   ::y2019::control_loops::drivetrain::LocalizerReplayer replay;
   replay.ProcessFile(FLAGS_logfile.c_str());
 
-  ::aos::Cleanup();
+  return 0;
 }