diff --git a/src/base-environments/youth_room/room_handle.gd b/src/base-environments/youth_room/room_handle.gd
index 4efb9af..4ca5d45 100644
--- a/src/base-environments/youth_room/room_handle.gd
+++ b/src/base-environments/youth_room/room_handle.gd
@@ -49,16 +49,3 @@ func _on_scene_finished(id: int, _repeat:bool):
 	return
 	save_game.mementos_complete &= 1 << id
 	save_room()
-
-#FIXME forgot to comment what this means, just marking it for removal
-var fixed := false
-func hotfix(_discard):
-	print("meep")
-	if not fixed:
-		await get_tree().create_timer(0.1).timeout
-		State.take_stage($logic/PlayerController, true)
-		fixed = true
-		dnd = false
-
-
-var dnd: bool
diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd
index 71bb47c..d43904a 100644
--- a/src/logic-scenes/card_picker/card_picker.gd
+++ b/src/logic-scenes/card_picker/card_picker.gd
@@ -204,7 +204,6 @@ func transition():
 		for card in output:
 			out_str.append(card.text if card.text != "" else "void")
 		cards_picked.emit(out_str)
-		get_parent().get_parent().get_parent().dnd = false
 		selection_state = DONE
 		Scenes.end_current_sequence()
 
@@ -232,8 +231,6 @@ func pick_cards(id: int, repeat: bool):
 		selection_state = CARDS
 	else:
 		Scenes.end_current_sequence()
-		#FIXME this workaround should be included in the Scene Manager.
-		get_parent().get_parent().get_parent().dnd = false
 
 func play_scene(_id, _repeat):
 	pass
diff --git a/src/logic-scenes/player_controller/player_controller.gd b/src/logic-scenes/player_controller/player_controller.gd
index a94c034..0a1f8b1 100644
--- a/src/logic-scenes/player_controller/player_controller.gd
+++ b/src/logic-scenes/player_controller/player_controller.gd
@@ -165,7 +165,7 @@ func _handle_mouse_input(event:InputEventMouseMotion):
 		current_mouse_rotation = event.relative
 
 func _input(event:InputEvent):
-	if get_parent().get_parent().dnd: return
+	if Scenes.current_sequence != -1: return
 	if has_stage and Scenes.current_sequence == -1:
 		if event is InputEventMouseMotion and Input.mouse_mode == Input.MOUSE_MODE_CAPTURED:
 			_handle_mouse_input(event)