diff --git a/README.md b/README.md
index 5f82e5241..934112c01 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ McStats: http://mcstats.org/plugin/AuthMe
 
 #####"The best authentication plugin for the Bukkit/Spigot API!"
 
-<p>Prevent username stealing on your server! Fully compatible with UUIDs and Craftbukkit/Spigot 1.8.X!<br>
+<p>Prevent username stealing on your server!<br>
 Use it to secure your Offline mode server or to increase your Online mode server's protection!</p>
 
 <p>AuthMeReloaded disallows players who aren't authenticated to do actions like placing blocks, moving,<br>
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 047cf4088..571fdbbe5 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -46,7 +46,6 @@ import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.security.crypts.SHA256;
 import fr.xephi.authme.settings.NewSetting;
-import fr.xephi.authme.settings.OtherAccounts;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SettingsMigrationService;
 import fr.xephi.authme.settings.Spawn;
@@ -121,7 +120,6 @@ public class AuthMe extends JavaPlugin {
     public NewAPI api;
     public SendMailSSL mail;
     public DataManager dataManager;
-    public OtherAccounts otherAccounts;
     public Location essentialsSpawn;
     /*
      * Plugin Hooks
@@ -258,9 +256,6 @@ public class AuthMe extends JavaPlugin {
         permsMan = initializePermissionsManager();
         commandHandler = initializeCommandHandler(permsMan, messages, passwordSecurity, newSettings);
 
-        // Setup otherAccounts file
-        this.otherAccounts = OtherAccounts.getInstance();
-
         // Set up Metrics
         MetricsStarter.setupMetrics(plugin, newSettings);
 
diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
index d6f1f3278..757789df3 100644
--- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
@@ -185,7 +185,6 @@ public class AsynchronousLogin {
             // makes player isLoggedin via API
             PlayerCache.getInstance().addPlayer(auth);
             database.setLogged(name);
-            plugin.otherAccounts.addPlayer(player.getUniqueId());
 
             // As the scheduling executes the Task most likely after the current
             // task, we schedule it in the end
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index b73fd58cd..6ff41bf60 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -157,7 +157,6 @@ public class AsyncRegister {
             plugin.getManagement().performLogin(player, "dontneed", true);
         }
 
-        plugin.otherAccounts.addPlayer(player.getUniqueId());
         ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin, settings);
         plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync);
 
diff --git a/src/main/java/fr/xephi/authme/settings/OtherAccounts.java b/src/main/java/fr/xephi/authme/settings/OtherAccounts.java
deleted file mode 100644
index 6e2796a32..000000000
--- a/src/main/java/fr/xephi/authme/settings/OtherAccounts.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package fr.xephi.authme.settings;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-/**
- * @author Xephi59
- * @version $Revision: 1.0 $
- */
-public class OtherAccounts extends CustomConfiguration {
-
-    private static OtherAccounts others = null;
-
-    public OtherAccounts() {
-        super(new File("." + File.separator + "plugins" + File.separator + "AuthMe" + File.separator + "otheraccounts.yml"));
-        others = this;
-        load();
-        save();
-    }
-
-    /**
-     * Method getInstance.
-     *
-     * @return OtherAccounts
-     */
-    public static OtherAccounts getInstance() {
-        if (others == null) {
-            others = new OtherAccounts();
-        }
-        return others;
-    }
-
-    /**
-     * Method clear.
-     *
-     * @param uuid UUID
-     */
-    public void clear(UUID uuid) {
-        set(uuid.toString(), new ArrayList<String>());
-        save();
-    }
-
-    /**
-     * Method addPlayer.
-     *
-     * @param uuid UUID
-     */
-    public void addPlayer(UUID uuid) {
-        try {
-            Player player = Bukkit.getPlayer(uuid);
-            if (player == null)
-                return;
-            if (!this.getStringList(uuid.toString()).contains(player.getName())) {
-                this.getStringList(uuid.toString()).add(player.getName());
-                save();
-            }
-        } catch (NoSuchMethodError | Exception e) {
-            //ignore
-        }
-    }
-
-    /**
-     * Method removePlayer.
-     *
-     * @param uuid UUID
-     */
-    public void removePlayer(UUID uuid) {
-        try {
-            Player player = Bukkit.getPlayer(uuid);
-            if (player == null)
-                return;
-            if (this.getStringList(uuid.toString()).contains(player.getName())) {
-                this.getStringList(uuid.toString()).remove(player.getName());
-                save();
-            }
-        } catch (NoSuchMethodError | Exception e) {
-            //ignore
-        }
-    }
-
-    /**
-     * Method getAllPlayersByUUID.
-     *
-     * @param uuid UUID
-     *
-     * @return StringList
-     */
-    public List<String> getAllPlayersByUUID(UUID uuid) {
-        return this.getStringList(uuid.toString());
-    }
-}