diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandsManagerRegistration.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandsManagerRegistration.java
index 5f8bfbc8c..7e64bf319 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandsManagerRegistration.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/CommandsManagerRegistration.java
@@ -31,6 +31,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+@Deprecated
+@SuppressWarnings("deprecation")
 public class CommandsManagerRegistration extends CommandRegistration {
 
     protected CommandsManager<?> commands;
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java
index 479681c6b..9f1912587 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java
@@ -35,6 +35,7 @@ import java.util.List;
 /**
 * An implementation of a dynamically registered {@link org.bukkit.command.Command} attached to a plugin
 */
+@SuppressWarnings("deprecation")
 public class DynamicPluginCommand extends org.bukkit.command.Command implements PluginIdentifiableCommand {
 
     protected final CommandExecutor owner;
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java
index 6f4cec526..7635d174e 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommandHelpTopic.java
@@ -30,6 +30,7 @@ import org.bukkit.help.HelpTopicFactory;
 
 import java.util.Map;
 
+@SuppressWarnings("deprecation")
 public class DynamicPluginCommandHelpTopic extends HelpTopic {
 
     private final DynamicPluginCommand cmd;
diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java
index df3b0806b..5263d3aba 100644
--- a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java
+++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandsManager.java
@@ -60,6 +60,7 @@ import java.util.Set;
  * @param <T> command sender class
  */
 @SuppressWarnings("ProtectedField")
+@Deprecated
 public abstract class CommandsManager<T> {
 
     protected static final Logger logger =
diff --git a/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java
new file mode 100644
index 000000000..8dd9c94ff
--- /dev/null
+++ b/worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * This package contains the old command system. It is no longer in use. Please switch
+ * to Piston, Intake, ACF, or similar systems.
+ */
+package com.sk89q.minecraft.util.commands;
\ No newline at end of file