diff --git a/player/Player.cs b/player/Player.cs
index 9a73840..0d3475d 100644
--- a/player/Player.cs
+++ b/player/Player.cs
@@ -3,7 +3,6 @@ public partial class Player : CharacterBody3D
 	public int PeerId => GetMultiplayerAuthority();
 	public bool IsLocal => this.IsAuthority();
 
-	// TODO: Add "Controller" suffix to these.
 	public MovementController  Movement  { get; private set; }
 	public CameraController    Camera    { get; private set; }
 	public AnimationController Animation { get; private set; }
diff --git a/scenes/ItemManager.cs b/scenes/ItemManager.cs
index a2e020c..99db1b5 100644
--- a/scenes/ItemManager.cs
+++ b/scenes/ItemManager.cs
@@ -34,6 +34,7 @@ public partial class ItemManager : Node
 
 
 	// FIXME: This should be fixed in 4.3 and thus not required anymore?
+	// FIXME: Don't actually rely on item path, use its TrackingId.
 	// https://github.com/godotengine/godot/issues/85883
 
 	internal enum RequestFunc { RequestPickup, RequestPlace, RequestThrow }
diff --git a/scripts/globals/RPC.cs b/scripts/globals/RPC.cs
index c22c75c..29bb2c9 100644
--- a/scripts/globals/RPC.cs
+++ b/scripts/globals/RPC.cs
@@ -43,7 +43,6 @@ public class RPC
 	void SendInternal(Node node, StringName method, params Variant[] args)
 	{
 		if ((_targets == null) && (_except == null))
-			// TODO: Check if RpcId is recommended for client -> server messages over just Rpc.
 			node.Rpc(method, args);
 		else {
 			var targets = _targets ?? node.Multiplayer.GetPeers();