diff --git a/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolManager.java b/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolManager.java
index 152a49643..2563ea93c 100644
--- a/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolManager.java
+++ b/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolManager.java
@@ -57,6 +57,7 @@ public interface ProtocolManager {
      * Returns the base protocol for a specific server protocol version.
      * The standard base protocols deal with status and login packets for userconnection initialization.
      *
+     * @param serverVersion server protocol version
      * @return base protocol for the given server protocol version
      */
     Protocol getBaseProtocol(int serverVersion);
diff --git a/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
index e0c120197..ccaac3e1b 100644
--- a/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
+++ b/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
@@ -76,7 +76,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_16_2 = register(751, "1.16.2");
     public static final ProtocolVersion v1_16_3 = register(753, "1.16.3");
     public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5));
-    public static final ProtocolVersion v1_17 = register(755, 22, "1.17");
+    public static final ProtocolVersion v1_17 = register(755, 23, "1.17");
     public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/api/src/main/java/us/myles/ViaVersion/protocols/base/VersionProvider.java b/api/src/main/java/us/myles/ViaVersion/protocols/base/VersionProvider.java
index cfb0cf149..c1c7ec556 100644
--- a/api/src/main/java/us/myles/ViaVersion/protocols/base/VersionProvider.java
+++ b/api/src/main/java/us/myles/ViaVersion/protocols/base/VersionProvider.java
@@ -35,12 +35,4 @@ public interface VersionProvider extends Provider {
      * @return closest server protocol version to the user's protocol version
      */
     int getClosestServerProtocol(UserConnection connection) throws Exception;
-
-    /**
-     * @deprecated misleading name, use {@link #getClosestServerProtocol(UserConnection)}
-     */
-    @Deprecated
-    default int getServerProtocol(UserConnection connection) throws Exception {
-        return getClosestServerProtocol(connection);
-    }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index faa685b53..074251433 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "us.myles"
-    version = "3.3.0-21w15a"
+    version = "3.3.0-21w16a"
     description = "Allow newer clients to join older server versions."
 }
 
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
index bbfc03a8c..401482282 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
@@ -212,7 +212,7 @@ public class Protocol1_17To1_16_4 extends Protocol<ClientboundPackets1_16_2, Cli
                 "minecraft:coal_ores", "minecraft:copper_ores", "minecraft:emerald_ores", "minecraft:cluster_max_harvestables");
         tagRewriter.addEmptyTags(RegistryType.BLOCK, "minecraft:crystal_sound_blocks", "minecraft:candle_cakes", "minecraft:candles",
                 "minecraft:snow_step_sound_blocks", "minecraft:inside_step_sound_blocks", "minecraft:occludes_vibration_signals", "minecraft:dripstone_replaceable_blocks",
-                "minecraft:cave_vines", "minecraft:lush_plants_replaceable", "minecraft:deepslate_ore_replaceables", "minecraft:lush_ground_replaceable",
+                "minecraft:cave_vines", "minecraft:moss_replaceable", "minecraft:deepslate_ore_replaceables", "minecraft:lush_ground_replaceable",
                 "minecraft:diamond_ores", "minecraft:iron_ores", "minecraft:lapis_ores", "minecraft:redstone_ores", "minecraft:stone_ore_replaceables",
                 "minecraft:coal_ores", "minecraft:copper_ores", "minecraft:emerald_ores", "minecraft:dirt", "minecraft:snow");
         tagRewriter.addEmptyTags(RegistryType.ENTITY, "minecraft:powder_snow_walkable_mobs", "minecraft:axolotl_always_hostiles", "minecraft:axolotl_tempted_hostiles",