diff --git a/src/resources/objects/SWGMap.java b/src/resources/objects/SWGMap.java
index 1dd0abdd..48638350 100644
--- a/src/resources/objects/SWGMap.java
+++ b/src/resources/objects/SWGMap.java
@@ -175,7 +175,7 @@ public class SWGMap<K, V> implements Map<K, V> {
 				V value = map.remove(key);
 				
 				if (value != null) {
-					queue(item(1, key, ((IDelta) value).getBytes(), true, true));
+					queue(item(1, (String) key, ((IDelta) value).getBytes(), true, true));
 				}
 				
 				return value;
diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index f0ee198c..c76f6309 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -611,7 +611,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	
 	public void removeSkillMod(SkillMod mod) {
 		if (mod != null) {
-			skillMods.remove(mod);
+			skillMods.remove(mod.getName());
 		}
 	}
 	
diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java
index 2e21e848..1352cc0f 100644
--- a/src/services/EquipmentService.java
+++ b/src/services/EquipmentService.java
@@ -221,7 +221,6 @@ public class EquipmentService implements INetworkDispatch {
 		if(equipping)
 		{
 			if(item.getStringAttribute("cat_wpn_damage.wpn_category") != null) creature.addSkillMod("display_only_critical", getWeaponCriticalChance(creature, item));
-			if(item.getStringAttribute("protection_level") != null) addForceProtection(creature, item);
 			if(item.getStringAttribute("proc_name") != null) core.buffService.addBuffToCreature(creature, item.getStringAttribute("proc_name").replace("@ui_buff:", ""), creature);
 			
 			for(Entry<String, Object> e : attributes.entrySet())