diff --git a/src/main/java/world/bentobox/challenges/ParseItem.java b/src/main/java/world/bentobox/challenges/ParseItem.java
index f3272a4..67fd806 100644
--- a/src/main/java/world/bentobox/challenges/ParseItem.java
+++ b/src/main/java/world/bentobox/challenges/ParseItem.java
@@ -11,7 +11,10 @@ import org.bukkit.potion.PotionType;
  * Used for converting config file entries to objects
  * @author tastybento
  *
+ * @deprecated
+ * @see world.bentobox.bentobox.util.ItemParser#parse(String)
  */
+@Deprecated
 public class ParseItem {
 
     private final ItemStack item;
diff --git a/src/main/java/world/bentobox/challenges/commands/admin/CreateChallenge.java b/src/main/java/world/bentobox/challenges/commands/admin/CreateChallenge.java
index 2024ccc..4d3f69d 100644
--- a/src/main/java/world/bentobox/challenges/commands/admin/CreateChallenge.java
+++ b/src/main/java/world/bentobox/challenges/commands/admin/CreateChallenge.java
@@ -9,6 +9,11 @@ import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.user.User;
 
+
+/**
+ * @deprecated Challenges can be creaded via GUI.
+ */
+@Deprecated
 public class CreateChallenge extends CompositeCommand {
 
     /**
diff --git a/src/main/java/world/bentobox/challenges/commands/admin/CreateSurrounding.java b/src/main/java/world/bentobox/challenges/commands/admin/CreateSurrounding.java
index e55c6d3..3ce860a 100644
--- a/src/main/java/world/bentobox/challenges/commands/admin/CreateSurrounding.java
+++ b/src/main/java/world/bentobox/challenges/commands/admin/CreateSurrounding.java
@@ -25,8 +25,9 @@ import world.bentobox.bentobox.util.Util;
 /**
  * Command to create a surrounding type challenge
  * @author tastybento
- *
+ * @deprecated Required blocks can be added via GUI. Not necessary.
  */
+@Deprecated
 public class CreateSurrounding extends CompositeCommand implements Listener {
 
     HashMap<UUID,SurroundChallengeBuilder> inProgress = new HashMap<>();
diff --git a/src/main/java/world/bentobox/challenges/commands/admin/ResetChallenge.java b/src/main/java/world/bentobox/challenges/commands/admin/ResetChallenge.java
index a644015..0774072 100644
--- a/src/main/java/world/bentobox/challenges/commands/admin/ResetChallenge.java
+++ b/src/main/java/world/bentobox/challenges/commands/admin/ResetChallenge.java
@@ -13,6 +13,11 @@ import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.util.Util;
 
+
+/**
+ * @deprecated Challenges can be reset via GUI.
+ */
+@Deprecated
 public class ResetChallenge extends CompositeCommand {
 
     private ChallengesManager manager;
diff --git a/src/main/java/world/bentobox/challenges/commands/admin/SurroundChallengeBuilder.java b/src/main/java/world/bentobox/challenges/commands/admin/SurroundChallengeBuilder.java
index 5ff9bce..ed4791c 100644
--- a/src/main/java/world/bentobox/challenges/commands/admin/SurroundChallengeBuilder.java
+++ b/src/main/java/world/bentobox/challenges/commands/admin/SurroundChallengeBuilder.java
@@ -12,8 +12,9 @@ import world.bentobox.bentobox.api.user.User;
 /**
  * Enables the state of a Surrounding Challenge to be stored as it is built
  * @author tastybento
- *
+ * @deprecated Levels and challenges can be created via GUI. Not necessary command.
  */
+@Deprecated
 public class SurroundChallengeBuilder {
     private ChallengesAddon addon;
     private String name;
diff --git a/src/main/java/world/bentobox/challenges/panel/AdminEditGUI.java b/src/main/java/world/bentobox/challenges/panel/AdminEditGUI.java
index 49bc3f5..b6aa579 100644
--- a/src/main/java/world/bentobox/challenges/panel/AdminEditGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/AdminEditGUI.java
@@ -13,6 +13,11 @@ import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 
+
+/**
+ * @deprecated All panels are reworked.
+ */
+@Deprecated
 public class AdminEditGUI implements ClickHandler {
 
     private ChallengesAddon addon;
diff --git a/src/main/java/world/bentobox/challenges/panel/AdminGUI.java b/src/main/java/world/bentobox/challenges/panel/AdminGUI.java
index 2cd9940..8883820 100644
--- a/src/main/java/world/bentobox/challenges/panel/AdminGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/AdminGUI.java
@@ -13,6 +13,11 @@ import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 
+
+/**
+ * @deprecated All panels are reworked.
+ */
+@Deprecated
 public class AdminGUI implements ClickHandler {
 
     private ChallengesAddon addon;
diff --git a/src/main/java/world/bentobox/challenges/panel/ChallengesPanels.java b/src/main/java/world/bentobox/challenges/panel/ChallengesPanels.java
index 85e9c68..ed39f2b 100644
--- a/src/main/java/world/bentobox/challenges/panel/ChallengesPanels.java
+++ b/src/main/java/world/bentobox/challenges/panel/ChallengesPanels.java
@@ -22,6 +22,10 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 
 
+/**
+ * @deprecated All panels are reworked.
+ */
+@Deprecated
 public class ChallengesPanels {
     private ChallengesAddon addon;
     private ChallengesManager manager;
diff --git a/src/main/java/world/bentobox/challenges/panel/ChallengesPanels2.java b/src/main/java/world/bentobox/challenges/panel/ChallengesPanels2.java
index 22ee2c3..3dfe4c9 100644
--- a/src/main/java/world/bentobox/challenges/panel/ChallengesPanels2.java
+++ b/src/main/java/world/bentobox/challenges/panel/ChallengesPanels2.java
@@ -21,6 +21,10 @@ import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
 
 
+/**
+ * @deprecated All panels are reworked.
+ */
+@Deprecated
 public class ChallengesPanels2 {
 
     public enum Mode {
diff --git a/src/main/java/world/bentobox/challenges/panel/CreateChallengeListener.java b/src/main/java/world/bentobox/challenges/panel/CreateChallengeListener.java
index feb0621..978b64b 100644
--- a/src/main/java/world/bentobox/challenges/panel/CreateChallengeListener.java
+++ b/src/main/java/world/bentobox/challenges/panel/CreateChallengeListener.java
@@ -7,6 +7,11 @@ import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.bentobox.api.panels.PanelListener;
 import world.bentobox.bentobox.api.user.User;
 
+
+/**
+ * @deprecated All panels are reworked.
+ */
+@Deprecated
 public class CreateChallengeListener implements PanelListener {
 
     private ChallengesAddon addon;
diff --git a/src/main/java/world/bentobox/challenges/panel/CreateChallengePanel.java b/src/main/java/world/bentobox/challenges/panel/CreateChallengePanel.java
index 93d8bb3..1c7473a 100644
--- a/src/main/java/world/bentobox/challenges/panel/CreateChallengePanel.java
+++ b/src/main/java/world/bentobox/challenges/panel/CreateChallengePanel.java
@@ -4,6 +4,11 @@ import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.user.User;
 
+
+/**
+ * @deprecated All panels are reworked.
+ */
+@Deprecated
 public class CreateChallengePanel {
 
     public CreateChallengePanel(ChallengesAddon addon, User user) {
diff --git a/src/main/java/world/bentobox/challenges/panel/RequiredPanel.java b/src/main/java/world/bentobox/challenges/panel/RequiredPanel.java
index 13affcb..59221fc 100644
--- a/src/main/java/world/bentobox/challenges/panel/RequiredPanel.java
+++ b/src/main/java/world/bentobox/challenges/panel/RequiredPanel.java
@@ -25,8 +25,9 @@ import world.bentobox.bentobox.util.Util;
  * Handles the requirements for a challenge
  * Items, blocks, entities
  * @author tastybento
- *
+ * @deprecated All panels are reworked.
  */
+@Deprecated
 public class RequiredPanel implements ClickHandler, PanelListener {
     private static final int CONTROL_NUMBER = 4;
     private Challenges challenge;
diff --git a/src/test/java/world/bentobox/challenges/ParseItemTest.java b/src/test/java/world/bentobox/challenges/ParseItemTest.java
index f5eb767..7a46f8a 100644
--- a/src/test/java/world/bentobox/challenges/ParseItemTest.java
+++ b/src/test/java/world/bentobox/challenges/ParseItemTest.java
@@ -26,6 +26,7 @@ import world.bentobox.challenges.ChallengesAddon;
 import world.bentobox.challenges.ParseItem;
 
 @RunWith(PowerMockRunner.class)
+@Deprecated
 public class ParseItemTest {
 
     private static ChallengesAddon addon;