diff --git a/vtk/src/commands/TimerCallbackCommand (conflicted copy 2024-05-03 143152).cpp b/vtk/src/commands/TimerCallbackCommand (conflicted copy 2024-05-03 143152).cpp
deleted file mode 100644
index 2a5391d..0000000
--- a/vtk/src/commands/TimerCallbackCommand (conflicted copy 2024-05-03 143152).cpp	
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "TimerCallbackCommand.h"
-#include "../helperClasses/Program.h"
-
-
-// TimerCallbackCommand::TimerCallbackCommand() : dt(3600), maxTime(3600*24*365), time(0) {}
-
-TimerCallbackCommand *New() {
-  TimerCallbackCommand *cb = new TimerCallbackCommand();
-  cb->setDefaults();
-  return cb;
-}
-
-void TimerCallbackCommand::Execute(vtkObject *caller, long unsigned int eventId, void* clientData, void* callData) {
-  this->time += this->dt;
-
-  if (this->time >= this->maxTime) {
-    return;
-    // TODO: how do we deal with reaching the end of the simulated dataset? Do we just stop simulating, loop back around? What about the location of the particles in this case? Just some ideas to consider, but we should iron this out pretty soon.
-  }
-
-  ((Program *)clientData)->updateData(this->time);
-}
diff --git a/vtk/src/commands/TimerCallbackCommand (conflicted copy 2024-05-03 151842).h b/vtk/src/commands/TimerCallbackCommand (conflicted copy 2024-05-03 151842).h
deleted file mode 100644
index 76ece9e..0000000
--- a/vtk/src/commands/TimerCallbackCommand (conflicted copy 2024-05-03 151842).h	
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef TIMERCALLBACKCOMMAND_H
-#define TIMERCALLBACKCOMMAND_H
-
-#include <vtkCallbackCommand.h>
-#include "../helperClasses/Program.h"
-
-class TimerCallbackCommand : public vtkCallbackCommand {
-public:
-  TimerCallbackCommand();
-  static TimerCallbackCommand* New(Program *program);
-  void Execute(vtkObject* caller, unsigned long eventId, void* vtkNotUsed(callData)) override;
-
-  void setDefaults();
-
-
-private:
-  int time;
-  int dt;
-  int maxTime;
-};
-
-#endif