diff --git a/Assets/Scripts/Behaviours/MiniMap.cs b/Assets/Scripts/Behaviours/MiniMap.cs
index 19c95373..82f410d8 100644
--- a/Assets/Scripts/Behaviours/MiniMap.cs
+++ b/Assets/Scripts/Behaviours/MiniMap.cs
@@ -203,9 +203,9 @@ namespace SanAndreasUnity.Behaviours
         #region Private fields
 
         // Texture & control flags
-		private Ped m_ped;
+		private Ped m_ped => Ped.Instance;
 
-        private PlayerController playerController;
+        private PlayerController playerController => PlayerController.Instance;
 
         private TextureDictionary huds;
 
@@ -261,13 +261,6 @@ namespace SanAndreasUnity.Behaviours
         {
             loadTextures();
 
-            GameObject playerObj = GameObject.FindGameObjectWithTag("Player");
-            if (playerObj != null)
-            {
-                m_ped = playerObj.GetComponent<Ped>();
-                playerController = playerObj.GetComponent<PlayerController>();
-            }
-
             if (canvas != null && canvas.enabled)
                 canvas.enabled = false;
 
diff --git a/Docs/Multiplayer.md b/Docs/Multiplayer.md
index 57d61a10..13b3e24e 100644
--- a/Docs/Multiplayer.md
+++ b/Docs/Multiplayer.md
@@ -14,8 +14,6 @@
 
 - OutOfRangeDestroyer script should be destroyed on clients (for vehicles) ; when player controls a vehicle, it should not be destroyed ; or simply make the script destroy objects only on server (if they are network objects) ;
 
-- "Kill all peds" button should also kill local ped ; "Destroy all vehicles" button should also destroy controlled vehicle ;
-
 - max num players should be configurable
 
 - display players on minimap