diff --git a/src/main/java/com/replaymod/extras/urischeme/UriScheme.java b/src/main/java/com/replaymod/extras/urischeme/UriScheme.java
index eddf816d..ee4e941a 100644
--- a/src/main/java/com/replaymod/extras/urischeme/UriScheme.java
+++ b/src/main/java/com/replaymod/extras/urischeme/UriScheme.java
@@ -73,17 +73,10 @@ public abstract class UriScheme {
         switch (SystemUtil.getOperatingSystem()) {
             case LINUX:
                 return new LinuxUriScheme();
-            //#if MC>=11500
-            //$$ case WINDOWS:
-            //$$     return new WindowsUriScheme();
-            //$$ case OSX:
-            //$$     return new OSXUriScheme();
-            //#else
-            case field_1133:
+            case WINDOWS:
                 return new WindowsUriScheme();
-            case field_1137:
+            case OSX:
                 return new OSXUriScheme();
-            //#endif
             case SOLARIS:
             case UNKNOWN:
             default:
diff --git a/src/main/java/com/replaymod/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java
index 1cd3be9b..f0bb20cb 100755
--- a/src/main/java/com/replaymod/recording/packet/PacketListener.java
+++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java
@@ -96,7 +96,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
     private long timePassedWhilePaused;
     private volatile boolean serverWasPaused;
     //#if MC>=11300
-    private NetworkState connectionState = NetworkState.field_11688;
+    private NetworkState connectionState = NetworkState.LOGIN;
     //#else
     //$$ private EnumConnectionState connectionState = EnumConnectionState.PLAY;
     //#endif
@@ -193,7 +193,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
 
             //#if MC>=11300
             if (packet instanceof LoginSuccessS2CPacket) {
-                connectionState = NetworkState.field_11690;
+                connectionState = NetworkState.PLAY;
             }
             //#endif
         } catch(Exception e) {
diff --git a/src/main/java/com/replaymod/render/RenderSettings.java b/src/main/java/com/replaymod/render/RenderSettings.java
index 01fdb1b6..df356908 100644
--- a/src/main/java/com/replaymod/render/RenderSettings.java
+++ b/src/main/java/com/replaymod/render/RenderSettings.java
@@ -174,12 +174,7 @@ public class RenderSettings {
 
     private static String findFFmpeg() {
         switch (SystemUtil.getOperatingSystem()) {
-            // TODO not sure why remap fails to remap this (even when manually added to mappings)
-            //#if MC>=11500
-            //$$ case WINDOWS:
-            //#else
-            case field_1133:
-            //#endif
+            case WINDOWS:
                 // Allow windows users to unpack the ffmpeg archive into a sub-folder of their .minecraft folder
                 File inDotMinecraft = new File(MCVer.getMinecraft().runDirectory, "ffmpeg/bin/ffmpeg.exe");
                 if (inDotMinecraft.exists()) {
@@ -187,12 +182,7 @@ public class RenderSettings {
                     return inDotMinecraft.getAbsolutePath();
                 }
                 break;
-            // TODO not sure why remap fails to remap this (even when manually added to mappings)
-            //#if MC>=11500
-            //$$ case OSX:
-            //#else
-            case field_1137:
-            //#endif
+            case OSX:
                 // The PATH doesn't seem to be set as expected on OSX, therefore we check some common locations ourselves
                 for (String path : new String[]{"/usr/local/bin/ffmpeg", "/usr/bin/ffmpeg"}) {
                     File file = new File(path);
diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java
index fa84bd5f..499cf7b3 100755
--- a/src/main/java/com/replaymod/replay/FullReplaySender.java
+++ b/src/main/java/com/replaymod/replay/FullReplaySender.java
@@ -465,7 +465,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
 
         int i = pb.readVarInt();
 
-        NetworkState state = loginPhase ? NetworkState.field_11688 : NetworkState.field_11690;
+        NetworkState state = loginPhase ? NetworkState.LOGIN : NetworkState.PLAY;
         //#if MC>=10800
         Packet p = state.getPacketHandler(NetworkSide.CLIENTBOUND, i);
         //#else
diff --git a/src/main/java/com/replaymod/replay/QuickReplaySender.java b/src/main/java/com/replaymod/replay/QuickReplaySender.java
index 1d30fcf8..ed243055 100644
--- a/src/main/java/com/replaymod/replay/QuickReplaySender.java
+++ b/src/main/java/com/replaymod/replay/QuickReplaySender.java
@@ -98,7 +98,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
                 //#else
                 Packet<?> mcPacket;
                 try {
-                    mcPacket = NetworkState.field_11690.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
+                    mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
                 } catch (IllegalAccessException | InstantiationException e) {
                     throw new IOException(e);
                 }