diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
index 708dd0ea..851db585 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
@@ -1,10 +1,7 @@
 package com.massivecraft.massivecore.command.type.enumeration;
 
-import com.massivecraft.massivecore.collections.MassiveSet;
 import org.bukkit.entity.EntityType;
 
-import java.util.Set;
-
 public class TypeEntityType extends TypeEnum<EntityType>
 {
 	// -------------------------------------------- //
@@ -17,25 +14,5 @@ public class TypeEntityType extends TypeEnum<EntityType>
 	{
 		super(EntityType.class);
 	}
-	
-	// -------------------------------------------- //
-	// OVERRIDE
-	// -------------------------------------------- //
-	
-	@Override
-	public Set<String> getNamesInner(EntityType value)
-	{
-		Set<String> ret = new MassiveSet<>(super.getNamesInner(value));
-		
-		if (value == EntityType.PIG_ZOMBIE)
-		{
-			ret.add("pigman");
-			ret.add("pigzombie");
-			ret.add("manpig");
-			ret.add("zombiepig");
-		}
-		
-		return ret;
-	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
index ff787704..ea147fd8 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
@@ -32,10 +32,6 @@ public class TypeWorldType extends TypeEnum<WorldType>
 			ret.add("normal");
 			ret.add("default");
 		}
-		else if (value == WorldType.VERSION_1_1)
-		{
-			ret.add("11");
-		}
 		
 		return ret;
 	}