diff --git a/main/src/main/java/net/citizensnpcs/util/Messages.java b/main/src/main/java/net/citizensnpcs/util/Messages.java
index c08687b4c..b89727c18 100644
--- a/main/src/main/java/net/citizensnpcs/util/Messages.java
+++ b/main/src/main/java/net/citizensnpcs/util/Messages.java
@@ -96,10 +96,8 @@ public class Messages {
     public static final String ENDERMAN_ANGRY_SET = "citizens.commands.npc.enderman.angry-set";
     public static final String ENDERMAN_ANGRY_UNSET = "citizens.commands.npc.enderman.angry-unset";
     public static final String ENTITY_TYPE_SET = "citizens.commands.npc.type.set";
-    public static final String EQUIPMENT_EDITOR_ALL_ITEMS_REMOVED = "citizens.editors.equipment.all-items-removed";
     public static final String EQUIPMENT_EDITOR_BEGIN = "citizens.editors.equipment.begin";
     public static final String EQUIPMENT_EDITOR_END = "citizens.editors.equipment.end";
-    public static final String EQUIPMENT_EDITOR_INVALID_BLOCK = "citizens.editors.equipment.invalid-block";
     public static final String EQUIPMENT_EDITOR_SHEEP_COLOURED = "citizens.editors.equipment.sheep-coloured";
     public static final String ERROR_CLEARING_GOALS = "citizens.nms-errors.clearing-goals";
     public static final String ERROR_GETTING_FIELD = "citizens.nms-errors.getting-field";
@@ -157,7 +155,6 @@ public class Messages {
     public static final String HORSE_COLOR_SET = "citizens.commands.npc.horse.color-set";
     public static final String HORSE_DESCRIBE = "citizens.commands.npc.horse.describe";
     public static final String HORSE_STYLE_SET = "citizens.commands.npc.horse.style-set";
-    public static final String HORSE_TYPE_SET = "citizens.commands.npc.horse.type-set";
     public static final String INVALID_AGE = "citizens.commands.npc.age.invalid-age";
     public static final String INVALID_ANCHOR_NAME = "citizens.commands.npc.anchor.invalid-name";
     public static final String INVALID_ANIMATION = "citizens.editors.waypoints.triggers.animation.invalid-animation";
@@ -314,9 +311,6 @@ public class Messages {
     public static final String RESPAWN_DELAY_SET = "citizens.commands.npc.respawn.delay-set";
     public static final String SADDLED_SET = "citizens.editors.equipment.saddled-set";
     public static final String SADDLED_STOPPED = "citizens.editors.equipment.saddled-stopped";
-    public static final String SCRIPT_COMPILED = "citizens.commands.script.compiled";
-    public static final String SCRIPT_COMPILING = "citizens.commands.script.compiling";
-    public static final String SCRIPT_FILE_MISSING = "citizens.commands.script.file-missing";
     public static final String SELECTION_PROMPT = "citizens.editors.selection.start-prompt";
     public static final String SELECTION_PROMPT_INVALID_CHOICE = "citizens.conversations.selection.invalid-choice";
     public static final String SHEARED_SET = "citizens.editors.equipment.sheared-set";
diff --git a/main/src/main/resources/messages_en.properties b/main/src/main/resources/messages_en.properties
index 6d5bfeea3..a2602fc61 100644
--- a/main/src/main/resources/messages_en.properties
+++ b/main/src/main/resources/messages_en.properties
@@ -125,8 +125,7 @@ citizens.commands.npc.hologram.line-add=Added a new hologram line: [[{0}]].
 citizens.commands.npc.hologram.cleared=Hologram lines cleared.
 citizens.commands.npc.horse.chest-set=The horse is now carrying a chest.
 citizens.commands.npc.horse.chest-unset=The horse is no longer carrying a chest.
-citizens.commands.npc.horse.color-set=The horse''s color was set to [[{0}]].
-citizens.commands.npc.horse.type-set=The horse''s type was set to [[{0}]].
+citizens.commands.npc.horse.color-set=The horse''s color was set to [[{0}]]. 
 citizens.commands.npc.horse.style-set=The horse''s style was set to [[{0}]].
 citizens.commands.npc.horse.describe=The horse''s color is [[{0}]], the type is [[{1}]] and the style is [[{2}]].
 citizens.commands.npc.horse.invalid-color=Invalid horse color given. Valid colors are: [[{0}]].
@@ -292,10 +291,7 @@ citizens.commands.requirements.must-be-ingame=You must be ingame to use that com
 citizens.commands.requirements.must-be-owner=You must be the owner of this NPC to execute that command.
 citizens.commands.requirements.must-have-selected=You must have an NPC selected to execute that command.
 citizens.commands.requirements.too-few-arguments=Too few arguments.
-citizens.commands.requirements.too-many-arguments=Too many arguments.
-citizens.commands.script.compiled=Script compiled.
-citizens.commands.script.compiling=Script compiling...
-citizens.commands.script.file-missing=The file [[{0}]] doesn''t exist!
+citizens.commands.requirements.too-many-arguments=Too many arguments.  
 citizens.commands.template.applied=Template applied to [[{0}]] NPCs.
 citizens.commands.template.conflict=A template by that name already exists.
 citizens.commands.template.created=Template created. Check your Citizens plugin folder.
@@ -323,11 +319,9 @@ citizens.economy.minimum-cost-required=Need at least [[{0}]].
 citizens.economy.money-withdrawn=Withdrew [[{0}]] for your NPC.
 citizens.editors.already-in-editor=You''re already in an editor!
 citizens.editors.copier.begin=<aqua>Entered the NPC copier!<br>Click anywhere to copy the currently selected NPC.
-citizens.editors.copier.end=Exited the NPC copier.
-citizens.editors.equipment.all-items-removed=[[{0}]] had all of its items removed.
+citizens.editors.copier.end=Exited the NPC copier. 
 citizens.editors.equipment.begin=<aqua>Entered the equipment editor!<br>[[Right click]] to equip the NPC or [[crouch right click]] to change the item in hand!<br>Type [[offhand]], [[chestplate]], [[helmet]], etc. in chat to equip specific slots with the item you''re holding!
-citizens.editors.equipment.end=Exited the equipment editor.
-citizens.editors.equipment.invalid-block=Invalid block!
+citizens.editors.equipment.end=Exited the equipment editor. 
 citizens.editors.equipment.saddled-set=[[{0}]] is now saddled.
 citizens.editors.equipment.saddled-stopped=[[{0}]] is no longer saddled.
 citizens.editors.equipment.sheared-set=[[{0}]] is now sheared.