diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java
index 97e4beac4..52e94c952 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java
@@ -37,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * @deprecated Deprecated and scheduled for removal without replacement
  * in favor of the build in setup wizard.
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 @Singleton
 public class MultiverseWorldManager extends BukkitWorldManager {
 
diff --git a/Core/src/main/java/com/plotsquared/core/command/Chat.java b/Core/src/main/java/com/plotsquared/core/command/Chat.java
index 9c9ad5876..38a554d62 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Chat.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Chat.java
@@ -29,12 +29,17 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.PlotArea;
 
+/**
+ * @deprecated Deprecated in favor of "/plot toggle wea" and scheduled for removal within the next major release.
+ * <br>
+ * Other command aliases are "/plot toggle worldedit", "/plot toggle we".
+ */
+@Deprecated(forRemoval = true)
 @CommandDeclaration(command = "chat",
         usage = "/plot chat",
         permission = "plots.chat",
         category = CommandCategory.CHAT,
         requiredType = RequiredType.PLAYER)
-@Deprecated
 public class Chat extends SubCommand {
 
     @Override
diff --git a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
index ddb4975b0..921f8d8c1 100644
--- a/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
+++ b/Core/src/main/java/com/plotsquared/core/configuration/Settings.java
@@ -426,7 +426,7 @@ public class Settings extends Config {
     }
 
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @Comment("Schematic interface related settings")
     public static class Web {
 
diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
index a65ac2009..48716c129 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
@@ -1181,15 +1181,6 @@ public abstract class PlotArea {
         return signMaterial;
     }
 
-    /**
-     * Get the legacy plot sign material before wall signs used a "wall" stance.
-     *
-     * @return the legacy sign material.
-     * @deprecated Use {@link #signMaterial()}. This method is used for 1.13 only and
-     * will be removed without replacement in favor of {@link #signMaterial()}
-     * once we remove the support for 1.13.
-     */
-    @Deprecated
     public String legacySignMaterial() {
         return legacySignMaterial;
     }
@@ -1316,7 +1307,15 @@ public abstract class PlotArea {
         return this.signMaterial;
     }
 
-    @Deprecated
+    /**
+     * Get the legacy plot sign material before wall signs used a "wall" stance.
+     *
+     * @return the legacy sign material.
+     * @deprecated Use {@link #signMaterial()}. This method is used for 1.13 only and
+     * will be removed without replacement in favor of {@link #signMaterial()}
+     * once we remove the support for 1.13.
+     */
+    @Deprecated(forRemoval = true)
     public String getLegacySignMaterial() {
         return this.legacySignMaterial;
     }
diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java
index 2f4a9a112..8f5286e62 100644
--- a/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java
+++ b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java
@@ -214,7 +214,7 @@ public abstract class PlotManager {
      * @return the world height
      * @deprecated In favor of custom world heights within 1.17 and therefore scheduled for removal without replacement
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public int getWorldHeight() {
         return 255;
     }
diff --git a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
index 5ea18e611..c376608eb 100644
--- a/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
+++ b/Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java
@@ -201,8 +201,10 @@ public abstract class QueueCoordinator {
      * @return success or not
      *
      * @deprecated Biomes now take XYZ, see {@code setBiome int x, int y, int z}
+     * <br>
+     * Scheduled for removal once we drop the support for versions not supporting 3D biomes.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public abstract boolean setBiome(int x, int z, @NonNull BiomeType biome);
 
     /**
diff --git a/Core/src/main/java/com/plotsquared/core/util/MainUtil.java b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java
index eebacec78..566e7901a 100644
--- a/Core/src/main/java/com/plotsquared/core/util/MainUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java
@@ -30,7 +30,7 @@ package com.plotsquared.core.util;
  *
  * @deprecated Do not use
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 public class MainUtil {
 
     /**
diff --git a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
index 1106be686..2b59db2c5 100644
--- a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
+++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
@@ -127,7 +127,7 @@ public abstract class SchematicHandler {
         this.subscriberFactory = subscriberFactory;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static void upload(
             @Nullable UUID uuid,
             final @Nullable String file,
@@ -520,7 +520,7 @@ public abstract class SchematicHandler {
         return null;
     }
 
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public void upload(final CompoundTag tag, UUID uuid, String file, RunnableVal<URL> whenDone) {
         if (tag == null) {
             TaskManager.runTask(whenDone);
diff --git a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
index 681fa6a40..e3484c72a 100644
--- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
+++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
@@ -195,7 +195,6 @@ public abstract class WorldUtil {
      */
     public abstract void getHighestBlock(@NonNull String world, int x, int z, @NonNull IntConsumer result);
 
-
     /**
      * Get the Y coordinate of the highest non-air block in the world, synchronously
      *