diff --git a/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java b/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java
index 6a584596..ef853256 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/destination/WorldDestination.java
@@ -115,7 +115,6 @@ public class WorldDestination implements MVDestination {
             this.world = ((MultiverseCore) plugin).getMVWorldManager().getMVWorld(items[1]);
             isValid = true;
             if (items.length == 3) {
-                // TODO: oh my god, what should we do here?
                 this.yaw = core.getLocationManipulation().getYaw(items[2]);
             }
         }
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
index eeb8203c..b0bce924 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/LocationManipulation.java
@@ -249,7 +249,6 @@ public class LocationManipulation {
         }
         float speed = getSpeed(v);
         float halfSpeed = (float) (speed / 2.0);
-        // TODO: Mathmatacize this:
         if (direction.equalsIgnoreCase("n")) {
             return new Vector(0, 0, -1 * speed);
         } else if (direction.equalsIgnoreCase("ne")) {
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/PurgeWorlds.java b/src/main/java/com/onarandombox/MultiverseCore/utils/PurgeWorlds.java
index e7d32820..cdced946 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/PurgeWorlds.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/PurgeWorlds.java
@@ -56,7 +56,7 @@ public class PurgeWorlds {
     /**
      * Convenience method for {@link #purgeWorld(CommandSender, MultiverseWorld, List, boolean, boolean)} that takes the settings from the world-config.
      *
-     * @param sender The {@link CommandSender} that initiated the action (TODO: Do we really need this?)
+     * @param sender The {@link CommandSender} that initiated the action
      * @param world The {@link MultiverseWorld}.
      */
     public void purgeWorld(CommandSender sender, MultiverseWorld world) {
@@ -70,7 +70,7 @@ public class PurgeWorlds {
 
     /**
      * Clear all animals/monsters that do not belong to a world according to the config.
-     * @param sender The {@link CommandSender} that initiated the action. (TODO: Do we really need this?)
+     * @param sender The {@link CommandSender} that initiated the action.
      * @param mvworld The {@link MultiverseWorld}.
      * @param thingsToKill A {@link List} of animals/monsters to be killed.
      * @param negateAnimals Whether the monsters in the list should be negated.
@@ -127,7 +127,6 @@ public class PurgeWorlds {
      */
     private boolean killMonster(MultiverseWorld mvworld, Entity e, List<String> creaturesToKill, boolean negate) {
         String entityName = "";
-        //TODO: Fixme once either Rigby puts his awesome thing in OR Enderdragon gets a toString, OR both.
         if (e instanceof EnderDragon) {
             entityName = "ENDERDRAGON";
         } else {
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java b/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java
index 130abbaa..0984c437 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/SafeTTeleporter.java
@@ -63,7 +63,6 @@ public class SafeTTeleporter {
      */
     public Location getSafeLocation(Location l, int tolerance, int radius) {
         // Check around the player first in a configurable radius:
-        // TODO: Make this configurable
         Location safe = checkAboveAndBelowLocation(l, tolerance, radius);
         if (safe != null) {
             safe.setX(safe.getBlockX() + .5); // SUPPRESS CHECKSTYLE: MagicNumberCheck