diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index c4404e9..33241ef 100644
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -103,7 +103,7 @@ public RobotContainer() {
     _elevatorSubsystem.setDefaultCommand(new OperateElevator(
       _elevatorSubsystem,
       () -> -_operatorFilterLeftY.calculate(MathUtil.applyDeadband(_operatorController.getLeftY(), 0.05))
-    ).alongWith(Commands.runOnce(() -> _shooterSubsystem.resetHoldNote())));
+    ));
 
     // Non drive/operate default commands
     _intakeSubsystem.setDefaultCommand(new FeedActuate(_intakeSubsystem, ActuatorState.STOWED, FeedMode.NONE));
diff --git a/src/main/java/frc/robot/commands/intake/FeedActuate.java b/src/main/java/frc/robot/commands/intake/FeedActuate.java
index a23de71..c62439e 100644
--- a/src/main/java/frc/robot/commands/intake/FeedActuate.java
+++ b/src/main/java/frc/robot/commands/intake/FeedActuate.java
@@ -50,7 +50,7 @@ public void initialize() {
   public void execute() {
     _intake.actuate(_actuatorState);
 
-    if (_feedMode == FeedMode.INTAKE && _intake.hasNote()) _intake.feed(FeedMode.NONE);
+    // if (_feedMode == FeedMode.INTAKE && _intake.hasNote()) _intake.feed(FeedMode.NONE);
   }
 
   // Called once the command ends or is interrupted.
diff --git a/src/main/java/frc/robot/commands/shooter/SpinShooter.java b/src/main/java/frc/robot/commands/shooter/SpinShooter.java
index c882855..64e9832 100644
--- a/src/main/java/frc/robot/commands/shooter/SpinShooter.java
+++ b/src/main/java/frc/robot/commands/shooter/SpinShooter.java
@@ -45,6 +45,6 @@ public void end(boolean interrupted) {}
   // Returns true when the command should end.
   @Override
   public boolean isFinished() {
-    return _runOnce || (_state == ShooterState.AMP && _shooter.holdNote());
+    return _runOnce /**|| (_state == ShooterState.AMP && _shooter.holdNote())*/;
   }
 }