diff --git a/src/com/massivecraft/mcore4/MPlugin.java b/src/com/massivecraft/mcore4/MPlugin.java
index 4b03ad77..c35e5d04 100644
--- a/src/com/massivecraft/mcore4/MPlugin.java
+++ b/src/com/massivecraft/mcore4/MPlugin.java
@@ -44,10 +44,10 @@ public abstract class MPlugin extends JavaPlugin implements Listener
 		this.gson = this.getGsonBuilder().create();
 		
 		// Create tools
-		this.cmd = new Cmd();
-		this.persist = new Persist();
-		this.one = new One(this);
-		this.lib = new LibLoader(this);
+		this.cmd = new Cmd(); // TODO: Stop creating this asap :)
+		this.persist = new Persist(); // TODO: Stop creating this asap :)
+		this.one = new One(this); // TODO: Stop creating this asap :)
+		this.lib = new LibLoader(this); // TODO: Stop creating this asap :)
 		
 		return true;
 	}
diff --git a/src/com/massivecraft/mcore4/cmd/Cmd.java b/src/com/massivecraft/mcore4/cmd/Cmd.java
index 2a9a2a3f..8f77389c 100644
--- a/src/com/massivecraft/mcore4/cmd/Cmd.java
+++ b/src/com/massivecraft/mcore4/cmd/Cmd.java
@@ -34,21 +34,15 @@ import com.massivecraft.mcore4.usys.Multiverse;
 
 public class Cmd
 {
+	// TODO: The cmd will no longer need to be instantiated.
+	// TODO: Perhaps I should remove the cmd system soon.
+	
 	protected Map<Class<?>, IArgHandler<?>> argHandlers = new HashMap<Class<?>, IArgHandler<?>>();
 	public Map<Class<?>, IArgHandler<?>> getArgHandlers() { return this.argHandlers; }
 	@SuppressWarnings("unchecked")
 	public <T> IArgHandler<T> getArgHandler(Class<T> clazz) { return (IArgHandler<T>) this.argHandlers.get(clazz); }
 	public <T> void setArgHandler(Class<T> clazz, IArgHandler<T> handler) { this.argHandlers.put(clazz, handler); }
 	
-	/**
-	 * @deprecated As of MCore 3, replaced by by {@link MCommand#register()}
-	 */
-	@Deprecated
-	public void addCommand(MCommand mcommand)
-	{
-		mcommand.register();
-	}
-	
 	public Cmd()
 	{
 		this.setArgHandler(Aspect.class, new AHAspect());