diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java
index 7e01b54..3678f33 100644
--- a/src/main/java/frc4388/robot/Constants.java
+++ b/src/main/java/frc4388/robot/Constants.java
@@ -29,6 +29,19 @@ public final class Constants {
         public static final int DRIVE_RIGHT_BACK_CAN_ID = 5;
         public static final int PIGEON_ID = 6;
 
+        /* Drive Inversions */
+        public static final boolean isRightMotorInverted = false;
+        public static final boolean isLeftMotorInverted = false;
+        public static final boolean isRightArcadeInverted = false;
+        public static final boolean isAuxPIDInverted = false;
+
+        /* Drive Configuration */
+        public static final double OPEN_LOOP_RAMP_RATE = 0.1;
+        public static final double NEUTRAL_DEADBAND = 0.04;
+        public static final SupplyCurrentLimitConfiguration SUPPLY_CURRENT_LIMIT_CONFIG =
+            new SupplyCurrentLimitConfiguration(false, 40, 35, 0.01);
+        public static final int CLOSED_LOOP_TIME_MS = 1;
+
         /* PID Constants Drive*/
         public static final int DRIVE_TIMEOUT_MS = 30;
         public static final Gains DRIVE_DISTANCE_GAINS_LOW = new Gains(0.1, 0.0, 1.0, 0.0, 0, 0.5);
@@ -88,17 +101,6 @@ public final class Constants {
         public static final double TICKS_PER_WHEEL_REV_LOW = TICKS_PER_MOTOR_REV * MOTOR_ROT_PER_WHEEL_ROT_LOW;
         public static final double TICKS_PER_INCH_LOW = TICKS_PER_WHEEL_REV_LOW/INCHES_PER_WHEEL_REV;
         public static final double INCHES_PER_TICK_LOW = 1/TICKS_PER_INCH_LOW;
-
-        public static final double OPEN_LOOP_RAMP_RATE = 0.1;
-        public static final double NEUTRAL_DEADBAND = 0.04;
-        public static final SupplyCurrentLimitConfiguration SUPPLY_CURRENT_LIMIT_CONFIG =
-            new SupplyCurrentLimitConfiguration(false, 40, 35, 0.01);
-        public static final boolean isRightMotorInverted = false;
-        public static final boolean isLeftMotorInverted = false;
-        public static final boolean isRightArcadeInverted = false;
-        public static final boolean isAuxPIDInverted = false;
-
-        public static final int CLOSED_LOOP_TIME_MS = 1;
     }
     
     public static final class IntakeConstants {
diff --git a/src/main/java/frc4388/robot/Robot.java b/src/main/java/frc4388/robot/Robot.java
index ec52eb2..1029754 100644
--- a/src/main/java/frc4388/robot/Robot.java
+++ b/src/main/java/frc4388/robot/Robot.java
@@ -7,7 +7,6 @@
 
 package frc4388.robot;
 
-import com.ctre.phoenix.motorcontrol.FeedbackDevice;
 import com.ctre.phoenix.motorcontrol.NeutralMode;
 
 import edu.wpi.first.wpilibj.TimedRobot;
diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java
index 3f40a5d..2156bd0 100644
--- a/src/main/java/frc4388/robot/RobotContainer.java
+++ b/src/main/java/frc4388/robot/RobotContainer.java
@@ -28,7 +28,6 @@ import edu.wpi.first.wpilibj2.command.button.JoystickButton;
 import frc4388.robot.Constants.*;
 import frc4388.robot.commands.DrivePositionMPAux;
 import frc4388.robot.commands.DriveWithJoystick;
-import frc4388.robot.commands.DriveStraightToPositionMM;
 import frc4388.robot.commands.RunClimberWithTriggers;
 import frc4388.robot.commands.RunExtenderOutIn;
 import frc4388.robot.commands.RunIntakeWithTriggers;