diff --git a/.idea/09HDscape.iml b/.idea/09HDscape.iml
index ff22e2cfd..1b7dd94b9 100644
--- a/.idea/09HDscape.iml
+++ b/.idea/09HDscape.iml
@@ -175,5 +175,14 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/09HDscape-server/data/libs/json-simple-1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/09HDscape-server/data/libs/json-simple-1.1.jar b/09HDscape-server/data/libs/json-simple-1.1.jar
new file mode 100644
index 000000000..f395f4147
Binary files /dev/null and b/09HDscape-server/data/libs/json-simple-1.1.jar differ
diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/Player.java b/09HDscape-server/src/org/crandor/game/node/entity/player/Player.java
index 616ae8d00..a17372a06 100644
--- a/09HDscape-server/src/org/crandor/game/node/entity/player/Player.java
+++ b/09HDscape-server/src/org/crandor/game/node/entity/player/Player.java
@@ -77,8 +77,6 @@ import org.crandor.net.packet.out.SkillLevel;
 import org.crandor.net.packet.out.UpdateSceneGraph;
 import org.crandor.plugin.Plugin;
 import org.crandor.tools.StringUtils;
-import org.crandor.tools.panel.Controller;
-import org.crandor.tools.panel.PlayerListPulse;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -250,8 +248,6 @@ public class Player extends Entity {
 	 */
 	private final HunterManager hunterManager = new HunterManager(this);
 
-	private final PlayerListPulse playerListPulse = new PlayerListPulse(this);
-
 	/**
 	 * The treasure trail manager.
 	 */
@@ -277,8 +273,6 @@ public class Player extends Entity {
 	 */
 	private final IronmanManager ironmanManager = new IronmanManager(this);
 
-	private final Controller controller = new Controller(this);
-
 	/**
 	 * The logout plugins.
 	 */
@@ -1261,15 +1255,6 @@ public class Player extends Entity {
 		this.skillTasks = skillTasks;
 	}
 
-	public Controller getController() {
-		return controller;
-	}
-
-	public PlayerListPulse getPlayerListPulse() {
-		return playerListPulse;
-	}
-
-
 	@Override
 	public String toString() {
 		return "Player [name=" + name + ", getRights()=" + getRights() + "]";