diff --git a/src/main/java/com/replaymod/core/utils/Utils.java b/src/main/java/com/replaymod/core/utils/Utils.java
index 1b518534..826f78fa 100644
--- a/src/main/java/com/replaymod/core/utils/Utils.java
+++ b/src/main/java/com/replaymod/core/utils/Utils.java
@@ -1,7 +1,6 @@
 package com.replaymod.core.utils;
 
 import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
 import com.google.common.net.PercentEscaper;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -27,7 +26,6 @@ import de.johni0702.minecraft.gui.versions.Image;
 import de.johni0702.minecraft.gui.versions.MCVer;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.crash.CrashReport;
-import net.minecraft.util.Identifier;
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.logging.log4j.LogManager;
@@ -38,15 +36,6 @@ import org.apache.logging.log4j.Logger;
 //$$ import org.lwjgl.input.Keyboard;
 //#endif
 
-//#if MC>=10800
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.client.util.DefaultSkinHelper;
-//#else
-//$$ import net.minecraft.client.Minecraft;
-//$$ import net.minecraft.client.entity.AbstractClientPlayer;
-//$$ import net.minecraft.entity.player.EntityPlayer;
-//#endif
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
@@ -233,25 +222,6 @@ public class Utils {
         }
     }
 
-    public static Identifier getResourceLocationForPlayerUUID(UUID uuid) {
-        //#if MC>=10800
-        PlayerListEntry info = getMinecraft().getNetworkHandler().getPlayerListEntry(uuid);
-        Identifier skinLocation;
-        if (info != null && info.hasSkinTexture()) {
-            skinLocation = info.getSkinTexture();
-        } else {
-            skinLocation = DefaultSkinHelper.getTexture(uuid);
-        }
-        return skinLocation;
-        //#else
-        //$$ EntityPlayer player = Minecraft.getMinecraft().theWorld.getPlayerEntityByUUID(uuid);
-        //$$ if (player != null || !(player instanceof AbstractClientPlayer)) {
-        //$$     return AbstractClientPlayer.locationStevePng;
-        //$$ }
-        //$$ return ((AbstractClientPlayer) player).getLocationSkin();
-        //#endif
-    }
-
     public static boolean isCtrlDown() {
         //#if MC>=11400
         return Screen.hasControlDown();
diff --git a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java
index 01bf1f8f..78ed336e 100644
--- a/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java
+++ b/src/main/java/com/replaymod/extras/playeroverview/PlayerOverviewGui.java
@@ -1,6 +1,5 @@
 package com.replaymod.extras.playeroverview;
 
-import com.replaymod.core.utils.Utils;
 import com.replaymod.replay.ReplayModReplay;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.RenderInfo;
@@ -20,6 +19,7 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import de.johni0702.minecraft.gui.utils.Colors;
 import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
 import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
 
@@ -94,7 +94,8 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
 
         Collections.sort(players, new PlayerComparator()); // Sort by name, spectators last
         for (final PlayerEntity p : players) {
-            final Identifier texture = Utils.getResourceLocationForPlayerUUID(p.getUuid());
+            if (!(p instanceof AbstractClientPlayerEntity)) continue;
+            final Identifier texture = ((AbstractClientPlayerEntity) p).getSkinTexture();
             final GuiClickable panel = new GuiClickable().setLayout(new HorizontalLayout().setSpacing(2)).addElements(
                     new HorizontalLayout.Data(0.5), new GuiImage() {
                         @Override
diff --git a/src/main/java/com/replaymod/replay/camera/CameraEntity.java b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
index 797c0ed9..f9c6fe53 100644
--- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java
+++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
@@ -472,8 +472,8 @@ public class CameraEntity
     @Override
     public Identifier getSkinTexture() {
         Entity view = this.client.getCameraEntity();
-        if (view != this && view instanceof PlayerEntity) {
-            return Utils.getResourceLocationForPlayerUUID(view.getUuid());
+        if (view != this && view instanceof AbstractClientPlayerEntity) {
+            return ((AbstractClientPlayerEntity) view).getSkinTexture();
         }
         return super.getSkinTexture();
     }