diff --git a/Commands/Test/CheckDrive.cpp b/Commands/Test/CheckDrive.cpp
deleted file mode 100644
index 8a114b7..0000000
--- a/Commands/Test/CheckDrive.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "CheckDrive.h"
-#include <cmath>
-#include "Commands/CommandGroup.h"
-#include "../../DentRobot.h"
-#include "../../RobotMap.h"
-CheckDrive::CheckDrive(int motorID): CommandGroup("CheckDrive"){
-  Requires(DentRobot::drivetrain);
-  motor = motorID;
-}
-void CheckDrive::Initialize(){
-  SetTimeout(1.0);
-}
-void CheckDrive::Execute(){
-  switch(motor){
-    case DRIVE_FRONT_LEFT_CAN:
-      DentRobot::drivetrain->TestMotor(DentRobot::drivetrain->FRONTLEFT, 1);
-      break;
-    case DRIVE_FRONT_RIGHT_CAN:
-      DentRobot::drivetrain->TestMotor(DentRobot::drivetrain->FRONTRIGHT, 1);
-      break;
-    case DRIVE_BACK_LEFT_CAN:
-      DentRobot::drivetrain->TestMotor(DentRobot::drivetrain->BACKLEFT, 1);
-      break;
-    case DRIVE_BACK_RIGHT_CAN:
-      DentRobot::drivetrain->TestMotor(DentRobot::drivetrain->BACKRIGHT, 1);
-      break;
-    default:
-      break;
-  }
-}
-bool CheckDrive::IsFinished(){
-  return false;
-}
-void CheckDrive::End(){
-}
-void CheckDrive::Interrupted(){
-  End();
-}
diff --git a/Commands/Test/CheckDrive.h b/Commands/Test/CheckDrive.h
deleted file mode 100644
index f398fb6..0000000
--- a/Commands/Test/CheckDrive.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef CHECKDRIVE_H
-#define CHECKDRIVE_H
-
-#include "Commands/Command.h"
-#include "../../DentRobot.h"
-#include "../../DentRobot.h"
-#include "WPILib.h"
-
-/**
- * @brief TODO
- */
-class CheckDrive: public CommandGroup{
-  private:
-    int motor; //<! TODO
-  public:
-    /**
-     * @brief TODO
-     *
-     * @param motorID
-     */
-    CheckDrive(int);
-    /**
-     * @brief Initializes the class
-     */
-    void Initialize();
-    /**
-     * @brief TODO
-     */
-    void Execute();
-    /**
-     * @brief Checks if the command is finished
-     *
-     * @return TODO
-     */
-    bool IsFinished();
-    /**
-     * @brief TODO
-     */
-    void End();
-    /**
-     * @brief Calls End()
-     */
-    void Interrupted();
-};
-#endif
diff --git a/Commands/Test/CheckRobot.cpp b/Commands/Test/CheckRobot.cpp
deleted file mode 100644
index 871c51b..0000000
--- a/Commands/Test/CheckRobot.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "Commands/CommandGroup.h"
-#include "../../DentRobot.h"
-#include "../../RobotMap.h"
-#include "../Elevator/Raise.h"
-#include "CheckRobot.h"
-#include "CheckDrive.h"
-CheckRobot::CheckRobot(){
-  AddSequential(new CheckDrive(DRIVE_FRONT_LEFT_CAN));
-  AddSequential(new CheckDrive(DRIVE_FRONT_RIGHT_CAN));
-  AddSequential(new CheckDrive(DRIVE_BACK_LEFT_CAN));
-  AddSequential(new CheckDrive(DRIVE_BACK_RIGHT_CAN));
-}
-// vim: ts=2:sw=2:et
diff --git a/Commands/Test/CheckRobot.h b/Commands/Test/CheckRobot.h
deleted file mode 100644
index eb14a2b..0000000
--- a/Commands/Test/CheckRobot.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CHECKROBOT_H
-#define CHECKROBOT_H
-
-#include "Commands/CommandGroup.h"
-#include "../../DentRobot.h"
-#include "../../DentRobot.h"
-#include "WPILib.h"
-
-/**
- * @brief TODO
- */
-class CheckRobot: public CommandGroup{
-  public:
-    /**
-     * @brief TODO
-     */
-    CheckRobot();
-};
-#endif
-// vim: ts=2:sw=2:et
diff --git a/OI.cpp b/OI.cpp
index 41b5973..fafa66c 100644
--- a/OI.cpp
+++ b/OI.cpp
@@ -9,7 +9,6 @@
 #include "Commands/BinElevator/BinOpenArms.h"
 #include "Commands/Autonomous/CollectTote.h"
 #include "Commands/Autonomous/ReleaseTote.h"
-#include "Commands/Test/CheckRobot.h"
 OI::OI(){
   // Joysticks
   leftStick=new Joystick(0);
@@ -45,10 +44,6 @@ OI::OI(){
   JoystickButton *right12=new JoystickButton(rightStick, 12);
   right12->CancelWhenPressed(raise);
   right12->CancelWhenPressed(lower);
-  // Basic motor test
-  CheckRobot* checkRobot=new CheckRobot();
-  JoystickButton *left7=new JoystickButton(leftStick, 7);
-  left7->WhenPressed(checkRobot);
 }
 Joystick* OI::GetRightStick(){
   return rightStick;