diff --git a/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java b/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java
index 51fd30dd..e47926ee 100644
--- a/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java
+++ b/src/main/java/net/citizensnpcs/api/astar/pathfinder/MinecraftBlockExaminer.java
@@ -4,7 +4,6 @@
 import java.util.ListIterator;
 import java.util.Random;
 import java.util.Set;
-import java.util.function.Function;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -12,6 +11,7 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.util.Vector;
 
+import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 
 import net.citizensnpcs.api.ai.event.CancelReason;
diff --git a/src/main/java/net/citizensnpcs/api/npc/NPC.java b/src/main/java/net/citizensnpcs/api/npc/NPC.java
index 75468c39..1231de7e 100644
--- a/src/main/java/net/citizensnpcs/api/npc/NPC.java
+++ b/src/main/java/net/citizensnpcs/api/npc/NPC.java
@@ -369,20 +369,24 @@ public interface NPC extends Agent, Cloneable {
      */
     public static final String PATHFINDER_OPEN_DOORS_METADATA = "pathfinder-open-doors";
     /**
-     * @see Skinnable
+     * @see SkinTrait
      */
+    @Deprecated
     public static final String PLAYER_SKIN_TEXTURE_PROPERTIES_METADATA = "player-skin-textures";
     /**
-     * @see Skinnable
+     * @see SkinTrait
      */
+    @Deprecated
     public static final String PLAYER_SKIN_TEXTURE_PROPERTIES_SIGN_METADATA = "player-skin-signature";
     /**
-     * @see Skinnable
+     * @see SkinTrait
      */
+    @Deprecated
     public static final String PLAYER_SKIN_USE_LATEST = "player-skin-use-latest-skin";
     /**
-     * @see Skinnable
+     * @see SkinTrait
      */
+    @Deprecated
     public static final String PLAYER_SKIN_UUID_METADATA = "player-skin-name";
     /**
      * The Integer delay to respawn in ticks after death. Only works if non-zero.