diff --git a/build.gradle b/build.gradle
index bfd5be045..dcc109d0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ plugins {
     id 'application'
 }
 
-sourceCompatibility = 17
-targetCompatibility = 17
+sourceCompatibility = 16
+targetCompatibility = 16
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/emu/grasscutter/database/DatabaseManager.java b/src/main/java/emu/grasscutter/database/DatabaseManager.java
index 3dccbcc0e..004f6ba80 100644
--- a/src/main/java/emu/grasscutter/database/DatabaseManager.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseManager.java
@@ -18,7 +18,6 @@ import emu.grasscutter.game.friends.Friendship;
 import emu.grasscutter.game.inventory.GenshinItem;
 
 public final class DatabaseManager {
-	private static MongoClient mongoClient;
 	private static Datastore datastore;
 	
 	private static final Class<?>[] mappedClasses = new Class<?>[] {
@@ -35,7 +34,7 @@ public final class DatabaseManager {
 	
 	public static void initialize() {
 		// Initialize
-		mongoClient = MongoClients.create(Grasscutter.getConfig().DatabaseUrl);
+		MongoClient mongoClient = MongoClients.create(Grasscutter.getConfig().DatabaseUrl);
 		
 		// Set mapper options.
 		MapperOptions mapperOptions = MapperOptions.builder()
diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java
index 3eff38cf9..073bf10fd 100644
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
@@ -1,20 +1,13 @@
 package emu.grasscutter.game;
 
-import dev.morphia.annotations.Collation;
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import dev.morphia.annotations.PreLoad;
+import dev.morphia.annotations.*;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.Utils;
-import dev.morphia.annotations.IndexOptions;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mongodb.DBObject;
-
 @Entity(value = "accounts", useDiscriminator = false)
 public class Account {
 	@Id private String id;
@@ -30,7 +23,7 @@ public class Account {
 	private String token;
 	private String sessionKey; // Session token for dispatch server
 	private List<String> permissions;
-
+	
 	@Deprecated
 	public Account() {
 		this.permissions = new ArrayList<>();
@@ -121,15 +114,16 @@ public class Account {
 		return this.token;
 	}
 	
-	@PreLoad
-	public void onLoad(DBObject dbObj) {
-		// Grant the superuser permissions to accounts created before the permissions update
-		if (!dbObj.containsField("permissions")) {
-			this.addPermission("*");
-		}
-	}
-	
 	public void save() {
 		DatabaseHelper.saveAccount(this);
 	}
+	
+//  TODO: Find an implementation for this. Morphia 2.0 breaks this method for some reason?
+//	@PreLoad
+//	public void onLoad(DBObject object) {
+//		// Grant the superuser permissions to accounts created before the permissions update
+//		if (!object.containsField("permissions")) {
+//			this.addPermission("*");
+//		}
+//	}
 }