diff --git a/core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java b/core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java
index 5b2ed133..d8c7f7ff 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/config/FloodgateConfig.java
@@ -121,9 +121,11 @@ public interface FloodgateConfig extends GenericPostInitializeCallback<ConfigLoa
 
     @ConfigSection
     interface DisconnectMessages {
+        @Comment
         @DefaultString("Please connect through the official Geyser")
         String invalidKey();
 
+        @Comment
         @DefaultString("Expected {} arguments, got {}. Is Geyser up-to-date?")
         String invalidArgumentsLength();
     }
@@ -151,7 +153,7 @@ public interface FloodgateConfig extends GenericPostInitializeCallback<ConfigLoa
         long linkCodeTimeout();
 
         @Comment
-        @DefaultString("mysql")
+        @DefaultString("sqlite")
         String type();
 
         @Comment
diff --git a/core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java b/core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java
index 83e1b799..333d7926 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/config/ProxyFloodgateConfig.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.floodgate.core.config;
 
+import org.geysermc.configutils.node.meta.Comment;
 import org.geysermc.configutils.node.meta.ConfigVersion;
 import org.geysermc.configutils.node.meta.Defaults.DefaultBoolean;
 import org.geysermc.configutils.node.meta.Inherit;
@@ -34,6 +35,7 @@ import org.geysermc.configutils.node.meta.Inherit;
  */
 @Inherit(ConfigVersion.class)
 public interface ProxyFloodgateConfig extends FloodgateConfig {
+    @Comment
     @DefaultBoolean
     boolean sendFloodgateData();
 }
diff --git a/core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java b/core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java
index 13f374d7..9503a751 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/util/PostEnableMessages.java
@@ -29,6 +29,7 @@ import io.micronaut.runtime.event.annotation.EventListener;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
@@ -39,7 +40,7 @@ import org.geysermc.floodgate.core.config.FloodgateConfig;
 import org.geysermc.floodgate.core.event.lifecycle.PostEnableEvent;
 
 @Listener
-@EagerSingleton
+@Singleton
 public final class PostEnableMessages {
     private final List<String> messages = new ArrayList<>();
 
diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
deleted file mode 100644
index 27d23b77..00000000
--- a/core/src/main/resources/config.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# In Floodgate bedrock player data is send encrypted
-# The following value should point to the key Floodgate generated.
-# The public key should be used for the Geyser(s) and the private key for the Floodgate(s)
-key-file-name: key.pem
-
-# Floodgate prepends a prefix to bedrock usernames to avoid conflicts
-# However, certain conflicts can cause issues with some plugins so this prefix is configurable using the property below
-# It is recommended to use a prefix that does not contain alphanumerical to avoid the possibility of duplicate usernames.
-username-prefix: "."
-
-# Should spaces be replaced with '_' in bedrock usernames?
-replace-spaces: true
-
-# The default locale for Floodgate. By default, Floodgate uses the system locale
-# default-locale: en_US
-
-disconnect:
-  # The disconnect message Geyser users should get when connecting
-  # to the server with an invalid key
-  invalid-key: Please connect through the official Geyser
-  # The disconnect message Geyser users should get when connecting
-  # to the server with the correct key but not with the correct data format
-  invalid-arguments-length: Expected {} arguments, got {}. Is Geyser up-to-date?
-
-# Configuration for player linking
-player-link:
-  # Whether to enable the linking system. Turning this off will prevent
-  # players from using the linking feature even if they are already linked.
-  enabled: true
-
-  # Whether to require a linked account in order to be able to join the server.
-  require-link: false
-
-  # Set the following option to true when you want to host your own linking database.
-  # -> This can work in addition to global linking.
-  # Note that you have to install a linking database implementation before enabling this, because
-  # it'll cause errors otherwise.
-  enable-own-linking: false
-
-  # The following three options only apply when 'enable-own-linking' is set to 'true'
-
-  # Whether to allow the use of /linkaccount and /unlinkaccount
-  # You can also use allow specific people to use the commands using the
-  # permissions floodgate.command.linkaccount and floodgate.command.unlinkaccount.
-  # This is only for linking, already connected people will stay connected
-  allowed: true
-  # The amount of time until a link code expires in seconds.
-  link-code-timeout: 300
-  # The player linking database type you want to use. This option is only used when there
-  # are multiple database implementations found in the configuration directory.
-  type: sqlite
-
-  # Whether to enable global linking. Global Linking is a central server where people can link their
-  # accounts (Java and Bedrock) and join on servers that have Global Linking enabled. The goal of
-  # Global Linking is to make linking easier by not having to link your accounts on every server.
-  # -> Your server-specific linking database will have priority over global linking.
-  # Global Linking should normally only be disabled when you don't have internet access or when
-  # you have limited internet access.
-  enable-global-linking: true
-
-metrics:
-  enabled: true
-  uuid: ${metrics.uuid}
-
-# Do not change this
-config-version: 3
diff --git a/core/src/main/resources/proxy-config.yml b/core/src/main/resources/proxy-config.yml
deleted file mode 100644
index bfb9df25..00000000
--- a/core/src/main/resources/proxy-config.yml
+++ /dev/null
@@ -1,9 +0,0 @@
->> config.yml
->>| 16
-# Should the proxy send the bedrock player data to the servers it is connecting to?
-# This requires Floodgate to be installed on the servers.
-# You'll get kicked if you don't use the plugin. The default value is false because of it
-send-floodgate-data: false
-
->>|
->>*
\ No newline at end of file