diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 29aded7209133ab8f1fbea861ce619498ed8476f..ecf7a54aa4c38dbb44fe58e96719d12efe275041 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -69,7 +69,6 @@ class PlayerKeySet:
             pickup_key: The key to pick items up or put them down.
             switch_key: The key for switching through controllable players.
             players: The player indices which this keyset can control.
-            # FIXME: not needed when player name is an index
             joystick: number of joystick (later check if available)
         """
         self.move_vectors: list[list[int]] = [[-1, 0], [1, 0], [0, -1], [0, 1]]
@@ -203,11 +202,9 @@ class PyGameGUI:
         self.game_height -= residual_y
 
     def setup_player_keys(self, n=1, disjunct=False):
-        # TODO maybe read the player names and keyboard keys from config file?
         # First four keys are for movement. Order: Down, Up, Left, Right.
         # 5th key is for interacting with counters.
         # 6th key ist for picking up things or dropping them.
-        # FIXME: add buttons of joystick here
         if n:
             players = list(range(self.number_humans_to_be_added))
             key_set1 = PlayerKeySet(
@@ -281,7 +278,6 @@ class PyGameGUI:
                 # Usually axis run in pairs, up/down for one, and left/right for the other. Triggers count as axes.
                 # You may want to take into account some tolerance to handle jitter, and
                 # joystick drift may keep the joystick from centering at 0 or using the full range of position values.
-                # FIXME: hardcoded threshold for tolerance
                 tolerance_threshold = 0.2
                 # axis 0 = joy stick left --> left & right
                 axis_left_right = joysticks[key_set.joystick].get_axis(0)