diff --git a/src/me/rockyhawk/commandpanels/commands/Commandpanelsdata.java b/src/me/rockyhawk/commandpanels/commands/Commandpanelsdata.java
index c231499..83c1cbf 100644
--- a/src/me/rockyhawk/commandpanels/commands/Commandpanelsdata.java
+++ b/src/me/rockyhawk/commandpanels/commands/Commandpanelsdata.java
@@ -1,19 +1,12 @@
 package me.rockyhawk.commandpanels.commands;
 
 import me.rockyhawk.commandpanels.CommandPanels;
-import me.rockyhawk.commandpanels.commandtags.CommandTagEvent;
-import me.rockyhawk.commandpanels.openpanelsmanager.PanelPosition;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 
-import java.util.UUID;
-
 public class Commandpanelsdata implements CommandExecutor {
     CommandPanels plugin;
     public Commandpanelsdata(CommandPanels pl) { this.plugin = pl; }
diff --git a/src/me/rockyhawk/commandpanels/commandtags/tags/other/DataTags.java b/src/me/rockyhawk/commandpanels/commandtags/tags/other/DataTags.java
index d7549c1..abaf668 100644
--- a/src/me/rockyhawk/commandpanels/commandtags/tags/other/DataTags.java
+++ b/src/me/rockyhawk/commandpanels/commandtags/tags/other/DataTags.java
@@ -2,12 +2,9 @@ package me.rockyhawk.commandpanels.commandtags.tags.other;
 
 import me.rockyhawk.commandpanels.CommandPanels;
 import me.rockyhawk.commandpanels.commandtags.CommandTagEvent;
-import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import java.util.UUID;
-
 public class DataTags implements Listener {
     CommandPanels plugin;
     public DataTags(CommandPanels pl) {
diff --git a/src/me/rockyhawk/commandpanels/completetabs/DataTabComplete.java b/src/me/rockyhawk/commandpanels/completetabs/DataTabComplete.java
index bb16a56..d62f343 100644
--- a/src/me/rockyhawk/commandpanels/completetabs/DataTabComplete.java
+++ b/src/me/rockyhawk/commandpanels/completetabs/DataTabComplete.java
@@ -1,7 +1,6 @@
 package me.rockyhawk.commandpanels.completetabs;
 
 import me.rockyhawk.commandpanels.CommandPanels;
-import me.rockyhawk.commandpanels.api.Panel;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -10,7 +9,6 @@ import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 public class DataTabComplete implements TabCompleter {
@@ -34,12 +32,11 @@ public class DataTabComplete implements TabCompleter {
                     output.add(p.getName());
                 }
             }else if(args.length == 3){
-                if(!args[0].equals("clear")) {
-                    try {
-                        return new ArrayList<>(plugin.panelData.dataConfig.getConfigurationSection("playerData." + plugin.panelData.getOffline(args[1])).getKeys(false));
-                    } catch (Exception ex) {
-                        return null;
-                    }
+                //the clear function is here as it is the only subcommand with 3 args
+                try {
+                    return new ArrayList<>(plugin.panelData.dataConfig.getConfigurationSection("playerData." + plugin.panelData.getOffline(args[1])).getKeys(false));
+                } catch (Exception ex) {
+                    return null;
                 }
             }
             return output;
diff --git a/src/me/rockyhawk/commandpanels/completetabs/ImportTabComplete.java b/src/me/rockyhawk/commandpanels/completetabs/ImportTabComplete.java
index 33a7120..e0ed3f8 100644
--- a/src/me/rockyhawk/commandpanels/completetabs/ImportTabComplete.java
+++ b/src/me/rockyhawk/commandpanels/completetabs/ImportTabComplete.java
@@ -2,11 +2,9 @@ package me.rockyhawk.commandpanels.completetabs;
 
 import me.rockyhawk.commandpanels.CommandPanels;
 import me.rockyhawk.commandpanels.api.Panel;
-import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;