diff --git a/Changelog.txt b/Changelog.txt
index a5d83723c..1ff791602 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -23,6 +23,7 @@ Version 1.4.04-dev
  ! Updated localization files
  - Removed deprecated functions from API classes.
  - Removed functions for getting the PlayerProfile - using API classes is preferred, but if not the McMMOPlayer should be used instead
+ - Removed Ender Dragon, Wither, and Witch from granting combat experience and related configuration options
 
 Version 1.4.03
  + Added option to advanced.yml to determine the # of enchant levels used when buffing Super Breaker & Giga Drill Breaker
diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
index 8c6d95b02..d97a381b4 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -437,7 +437,6 @@ public final class CombatUtils {
                     case BLAZE:
                     case CAVE_SPIDER:
                     case CREEPER:
-                    case ENDER_DRAGON:
                     case ENDERMAN:
                     case GHAST:
                     case GIANT:
@@ -446,8 +445,6 @@ public final class CombatUtils {
                     case SILVERFISH:
                     case SLIME:
                     case SPIDER:
-                    case WITCH:
-                    case WITHER:
                     case ZOMBIE:
                         baseXP = Config.getInstance().getCombatXP(type);
                         break;
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index e909b533c..2c9c346db 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -340,9 +340,6 @@ Experience:
             Silverfish: 3.0
             Blaze: 3.0
             Magma_Cube: 2.0
-            Ender_Dragon: 8.0
-            Wither: 7.0
-            Witch: 4.0
             Iron_Golem: 2.0
             Wither_Skeleton: 4.0
 #