diff --git a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
index 2ee00c4..8cc5294 100644
--- a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
+++ b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java
@@ -4,7 +4,6 @@ import java.util.List;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminDeleteCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminEmptyTrashCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminGetrankCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand;
@@ -13,10 +12,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminResetFlagsCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminSettingsCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminSwitchCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminSwitchtoCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand;
-import world.bentobox.bentobox.api.commands.admin.AdminTrashCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand;
@@ -81,11 +77,11 @@ public class AdminCommand extends CompositeCommand {
         // Reset flags
         new AdminResetFlagsCommand(this);
         // Trash
-        new AdminTrashCommand(this);
-        new AdminEmptyTrashCommand(this);
-        new AdminSwitchtoCommand(this);
+        //new AdminTrashCommand(this);
+        //new AdminEmptyTrashCommand(this);
+        //new AdminSwitchtoCommand(this);
         // Switch
-        new AdminSwitchCommand(this);
+        //new AdminSwitchCommand(this);
         // Purge
         new AdminPurgeCommand(this);
         // Settings
diff --git a/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java b/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
index e945745..4d50b92 100644
--- a/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
+++ b/src/test/java/world/bentobox/bskyblock/commands/AdminCommandTest.java
@@ -40,7 +40,7 @@ import world.bentobox.bskyblock.Settings;
 @PrepareForTest({Bukkit.class, BentoBox.class, User.class })
 public class AdminCommandTest {
 
-    private static final int NUM_COMMANDS = 29;
+    private static final int NUM_COMMANDS = 25;
     @Mock
     private User user;
     @Mock