diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/data/BukkitUserImportRefiner.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/data/BukkitUserImportRefiner.java
index b1d7bb389..7afd4683e 100644
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/data/BukkitUserImportRefiner.java
+++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/system/importing/data/BukkitUserImportRefiner.java
@@ -157,7 +157,7 @@ public class BukkitUserImportRefiner {
     private void addFoundUUIDs(Map<String, String> foundUUIDs) {
         List<UserImportData> found = new ArrayList<>();
 
-        missingUUIDs.entrySet().parallelStream().forEach((entry) -> {
+        missingUUIDs.entrySet().parallelStream().forEach(entry -> {
             UserImportData importer = entry.getKey();
             String name = entry.getValue();
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java b/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java
index 125db51ac..aead059b5 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/H2DB.java
@@ -75,7 +75,6 @@ public class H2DB extends SQLDB {
             throw new DBInitException(e.getMessage(), e);
         }
 
-        // TODO Figure out if execute("SET REFERENTIAL_INTEGRITY FALSE"); is required
         startConnectionPingTask();
     }
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/cache/DataCache.java b/Plan/common/src/main/java/com/djrapitops/plan/system/cache/DataCache.java
deleted file mode 100644
index 5f870edc7..000000000
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/cache/DataCache.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *  This file is part of Player Analytics (Plan).
- *
- *  Plan is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License v3 as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Plan 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 Plan. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.djrapitops.plan.system.cache;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * This class is present to not break compiling as some PlanPluginBridge dagger components inject DataCache.
- *
- * @author Rsl1122
- */
-@Singleton
-@Deprecated
-public class DataCache {
-
-    @Inject
-    public DataCache() {
-        // Dagger requires an Inject constructor.
-    }
-
-}
\ No newline at end of file
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java b/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
index 45cf7f6d6..29c67cf4f 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
@@ -33,6 +33,7 @@ import javax.inject.Singleton;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 
 /**
  * Manages the Server UUID for Bukkit servers.
@@ -120,7 +121,7 @@ public class ServerServerInfo extends ServerInfo {
         return registerServer(generateNewUUID());
     }
 
-    private Server registerServer(UUID serverUUID) throws Exception {
+    private Server registerServer(UUID serverUUID) throws ExecutionException, InterruptedException, IOException {
         Database db = dbSystem.getDatabase();
 
         // Create the server object