diff --git a/src/main/java/de/bixilon/minosoft/data/ChatTextPositions.java b/src/main/java/de/bixilon/minosoft/data/ChatTextPositions.java
index 17a020be8..c60da4000 100644
--- a/src/main/java/de/bixilon/minosoft/data/ChatTextPositions.java
+++ b/src/main/java/de/bixilon/minosoft/data/ChatTextPositions.java
@@ -21,8 +21,4 @@ public enum ChatTextPositions {
     public static ChatTextPositions byId(int id) {
         return values()[id];
     }
-
-    public int getId() {
-        return ordinal();
-    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/data/Difficulties.java b/src/main/java/de/bixilon/minosoft/data/Difficulties.java
index 8fdfa7d27..c3075213c 100644
--- a/src/main/java/de/bixilon/minosoft/data/Difficulties.java
+++ b/src/main/java/de/bixilon/minosoft/data/Difficulties.java
@@ -22,8 +22,4 @@ public enum Difficulties {
     public static Difficulties byId(int id) {
         return values()[id];
     }
-
-    public int getId() {
-        return ordinal();
-    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/data/Directions.java b/src/main/java/de/bixilon/minosoft/data/Directions.java
index 2eb68bb20..a792a22a9 100644
--- a/src/main/java/de/bixilon/minosoft/data/Directions.java
+++ b/src/main/java/de/bixilon/minosoft/data/Directions.java
@@ -24,8 +24,4 @@ public enum Directions {
     public static Directions byId(int id) {
         return values()[id];
     }
-
-    public int getId() {
-        return ordinal();
-    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/data/SoundCategories.java b/src/main/java/de/bixilon/minosoft/data/SoundCategories.java
index 1e7ae1a65..36fc37a71 100644
--- a/src/main/java/de/bixilon/minosoft/data/SoundCategories.java
+++ b/src/main/java/de/bixilon/minosoft/data/SoundCategories.java
@@ -28,8 +28,4 @@ public enum SoundCategories {
     public static SoundCategories byId(int id) {
         return values()[id];
     }
-
-    public int getId() {
-        return ordinal();
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/de/bixilon/minosoft/data/entities/Poses.java b/src/main/java/de/bixilon/minosoft/data/entities/Poses.java
index 96a74ff0e..7e427f725 100644
--- a/src/main/java/de/bixilon/minosoft/data/entities/Poses.java
+++ b/src/main/java/de/bixilon/minosoft/data/entities/Poses.java
@@ -25,8 +25,4 @@ public enum Poses {
     public static Poses byId(int id) {
         return values()[id];
     }
-
-    public int getId() {
-        return ordinal();
-    }
 }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java
index 1c3125b0a..1e6e45e54 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/handshaking/PacketHandshake.java
@@ -45,7 +45,7 @@ public class PacketHandshake implements ServerboundPacket {
         buffer.writeVarInt((nextState == ConnectionStates.STATUS ? -1 : connection.getVersion().getProtocolVersion())); // get best protocol version
         buffer.writeString(address.getHostname());
         buffer.writeShort((short) address.getPort());
-        buffer.writeVarInt(nextState.getId());
+        buffer.writeVarInt(nextState.ordinal());
         return buffer;
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java
index ee329736d..ef66f7fc8 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientSettings.java
@@ -47,7 +47,7 @@ public class PacketClientSettings implements ServerboundPacket {
         buffer.writeByte((byte) 0x00); // chat settings (nobody uses them)
         buffer.writeBoolean(true); // chat colors
         if (buffer.getProtocolId() < 6) {
-            buffer.writeByte((byte) Difficulties.NORMAL.getId()); // difficulty
+            buffer.writeByte((byte) Difficulties.NORMAL.ordinal()); // difficulty
             buffer.writeBoolean(true); // cape
         } else {
             buffer.writeByte((byte) 0b01111111); // ToDo: skin parts
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java
index 004e3c95a..58e73212b 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java
@@ -27,8 +27,4 @@ public enum ConnectionStates {
     public static ConnectionStates byId(int id) {
         return values()[id];
     }
-
-    public int getId() {
-        return ordinal();
-    }
 }