diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 055d51c..fcef5d9 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -18,7 +18,7 @@ class EndBallEvent(Event):
         self.gameState.currentPlayer.removeBall()
 
         self.scorePoints()
-        self.gameState.currentPlayer.reset()
+        self.gameState.currentPlayer.deactivate()
 
         if self.gameState.currentPlayer.ballsLeft == 0:
             EndGameEvent().trigger(None)
diff --git a/events/StartBallEvent.py b/events/StartBallEvent.py
index c345a0c..e0d7517 100644
--- a/events/StartBallEvent.py
+++ b/events/StartBallEvent.py
@@ -1,22 +1,13 @@
 from Event import Event
 from solenoids.OutHoleSolenoid import OutHoleSolenoid
-from solenoids.BottomLeftBankSolenoid import BottomLeftBankSolenoid
-from solenoids.BottomRightBankSolenoid import BottomRightBankSolenoid
-from solenoids.TopCentralBankSolenoid import TopCentralBankSolenoid
 from solenoids.MainFlipper import MainFlipper
 
 
 class StartBallEvent(Event):
-    def __init__(self, gameState):
-        self.gameState = gameState
+    def __init__(self):
         self.flipper = MainFlipper()
         super().__init__("Start Ball Event")
 
     def trigger(self, target):
         super().trigger(target)
-        BottomRightBankSolenoid().trigger()
-        BottomLeftBankSolenoid().trigger()
-        TopCentralBankSolenoid().trigger()
         OutHoleSolenoid().trigger()
-        self.flipper.activate()
-        self.gameState.currentPlayer.activate()