diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index b44a581c..9dc1d685 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -178,15 +178,6 @@ public class AuthMe extends JavaPlugin {
         return pluginBuildNumber;
     }
 
-    /**
-     * Get the plugin's Settings.
-     *
-     * @return Plugin's settings.
-     */
-    public Settings getSettings() {
-        return settings;
-    }
-
     /**
      * Get the Messages instance.
      *
@@ -478,12 +469,13 @@ public class AuthMe extends JavaPlugin {
     private void setupMetrics() {
         try {
             Metrics metrics = new Metrics(this);
-            Graph messagesLanguage = metrics.createGraph("Messages language");
-            Graph databaseBackend = metrics.createGraph("Database backend");
+            Graph languageGraph = metrics.createGraph("Messages language");
+            Graph backendGraph = metrics.createGraph("Database backend");
 
             // Custom graphs
             if (newSettings.getMessagesFile().exists()) {
-                messagesLanguage.addPlotter(new Metrics.Plotter(Settings.messagesLanguage) {
+                String messagesLanguage = newSettings.getProperty(PluginSettings.MESSAGES_LANGUAGE);
+                languageGraph.addPlotter(new Metrics.Plotter(messagesLanguage) {
 
                     @Override
                     public int getValue() {
@@ -491,7 +483,9 @@ public class AuthMe extends JavaPlugin {
                     }
                 });
             }
-            databaseBackend.addPlotter(new Metrics.Plotter(Settings.getDataSource.toString()) {
+
+            DataSource.DataSourceType dataSource = newSettings.getProperty(DatabaseSettings.BACKEND);
+            backendGraph.addPlotter(new Metrics.Plotter(dataSource.toString()) {
 
                 @Override
                 public int getValue() {
@@ -503,8 +497,9 @@ public class AuthMe extends JavaPlugin {
             ConsoleLogger.info("Metrics started successfully!");
         } catch (Exception e) {
             // Failed to submit the metrics data
+            ConsoleLogger.showError("Can't start Metrics! The plugin will work anyway... (Encountered "
+                + StringUtils.formatException(e) + ")");
             ConsoleLogger.writeStackTrace(e);
-            ConsoleLogger.showError("Can't start Metrics! The plugin will work anyway...");
         }
     }
 
@@ -884,18 +879,18 @@ public class AuthMe extends JavaPlugin {
     }
 
     public String replaceAllInfo(String message, Player player) {
-        int playersOnline = Utils.getOnlinePlayers().size();
-        message = message.replace("&", "\u00a7");
-        message = message.replace("{PLAYER}", player.getName());
-        message = message.replace("{ONLINE}", "" + playersOnline);
-        message = message.replace("{MAXPLAYERS}", "" + server.getMaxPlayers());
-        message = message.replace("{IP}", getIP(player));
-        message = message.replace("{LOGINS}", "" + PlayerCache.getInstance().getLogged());
-        message = message.replace("{WORLD}", player.getWorld().getName());
-        message = message.replace("{SERVER}", server.getServerName());
-        message = message.replace("{VERSION}", server.getBukkitVersion());
-        message = message.replace("{COUNTRY}", GeoLiteAPI.getCountryName(getIP(player)));
-        return message;
+        String playersOnline = Integer.toString(Utils.getOnlinePlayers().size());
+        return message
+            .replace("&", "\u00a7")
+            .replace("{PLAYER}", player.getName())
+            .replace("{ONLINE}", playersOnline)
+            .replace("{MAXPLAYERS}", Integer.toString(server.getMaxPlayers()))
+            .replace("{IP}", getIP(player))
+            .replace("{LOGINS}", Integer.toString(PlayerCache.getInstance().getLogged()))
+            .replace("{WORLD}", player.getWorld().getName())
+            .replace("{SERVER}", server.getServerName())
+            .replace("{VERSION}", server.getBukkitVersion())
+            .replace("{COUNTRY}", GeoLiteAPI.getCountryName(getIP(player)));
     }
 
     /**
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index 2ef20442..c745cf84 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -8,11 +8,7 @@ import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.util.Wrapper;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -77,7 +73,7 @@ public final class Settings {
         getMySQLColumnIp, getMySQLColumnLastLogin, getMySQLColumnSalt,
         getMySQLColumnGroup, getMySQLColumnEmail, unRegisteredGroup,
         backupWindowsPath, getRegisteredGroup,
-        messagesLanguage, getMySQLlastlocX, getMySQLlastlocY,
+        getMySQLlastlocX, getMySQLlastlocY,
         getMySQLlastlocZ, rakamakUsers, rakamakUsersIp, getmailAccount,
         getMySQLColumnId, getMySQLlastlocWorld, defaultWorld,
         getPhpbbPrefix, getWordPressPrefix, getMySQLColumnLogged,
@@ -125,7 +121,6 @@ public final class Settings {
     }
 
     public static void loadVariables() {
-        messagesLanguage = checkLang(configFile.getString("settings.messagesLanguage", "en").toLowerCase());
         isPermissionCheckEnabled = configFile.getBoolean("permission.EnablePermissionCheck", false);
         isForcedRegistrationEnabled = configFile.getBoolean("settings.registration.force", true);
         isRegistrationEnabled = configFile.getBoolean("settings.registration.enabled", true);