diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
index 40d1d45c9..a7d1377bb 100644
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
+++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
@@ -126,7 +126,6 @@ public class PlayerOnlineListener implements Listener {
 
     private void actOnJoinEvent(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        // TODO Move update notification to the website.
 
         UUID uuid = player.getUniqueId();
         long time = System.currentTimeMillis();
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java
index fd470b2e3..755b7cdb3 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 /**
  * Operation methods for saving data.
  * <p>
- * Note: Method names subject to change (TODO remove insert update and such)
+ * Note: Method names subject to change
  *
  * @author Rsl1122
  */
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java
index 2fa97b759..d0b8acb41 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/tables/HtmlTables.java
@@ -100,7 +100,7 @@ public class HtmlTables {
      * Create a new Nickname table.
      *
      * @param nicknames   List of {@link Nickname}s to be added to the table.
-     * @param serverNames Names of the servers, for the server column. // TODO Move Server names to Nickname object.
+     * @param serverNames Names of the servers, for the server column.
      * @return a new {@link NicknameTable}.
      */
     public TableContainer nicknameTable(List<Nickname> nicknames, Map<UUID, String> serverNames) {
@@ -134,7 +134,7 @@ public class HtmlTables {
     /**
      * Create a new Session table for a server.
      *
-     * @param playerNames Map of UUID - Name pairs of the players. // TODO Move Player names to Session object.
+     * @param playerNames Map of UUID - Name pairs of the players.
      * @param sessions    List of {@link Session}s that occurred on the server.
      * @return a new {@link ServerSessionTable}.
      */