diff --git a/src/main/java/com/massivecraft/factions/TerritoryAccess.java b/src/main/java/com/massivecraft/factions/TerritoryAccess.java
index b9a4cbd2..7b3f3139 100644
--- a/src/main/java/com/massivecraft/factions/TerritoryAccess.java
+++ b/src/main/java/com/massivecraft/factions/TerritoryAccess.java
@@ -91,7 +91,7 @@ public class TerritoryAccess
 	}
 	
 	// -------------------------------------------- //
-	// FIELDS: UNIVERSED
+	// FIELDS: DIRECT
 	// -------------------------------------------- //
 	
 	public Faction getHostFaction()
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java
index 16a8809a..4bcddf87 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsFaction.java
@@ -57,7 +57,7 @@ public class CmdFactionsFaction extends FCommand
 		boolean normal = faction.isNormal();
 		
 		// INFO: Title
-		msg(Txt.titleize(Txt.upperCaseFirst(faction.getUniverse()) + " Faction " + faction.getName(usender)));
+		msg(Txt.titleize("Faction " + faction.getName(usender)));
 		
 		// INFO: Description
 		msg("<a>Description: <i>%s", faction.getDescription());	
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java
index f4fa28e0..5be23f6c 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsPlayer.java
@@ -41,7 +41,7 @@ public class CmdFactionsPlayer extends FCommand
 		if (mplayer == null) return;
 		
 		// INFO: Title
-		msg(Txt.titleize(Txt.upperCaseFirst(mplayer.getUniverse()) + " Player " + mplayer.describeTo(usender)));
+		msg(Txt.titleize("Player " + mplayer.describeTo(usender)));
 		
 		// INFO: Power (as progress bar)
 		double progressbarQuota = mplayer.getPower() / mplayer.getPowerMax();
diff --git a/src/main/java/com/massivecraft/factions/entity/Faction.java b/src/main/java/com/massivecraft/factions/entity/Faction.java
index d13b2815..57b69cbc 100644
--- a/src/main/java/com/massivecraft/factions/entity/Faction.java
+++ b/src/main/java/com/massivecraft/factions/entity/Faction.java
@@ -102,7 +102,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 	// Can anyone join the Faction?
 	// If the faction is open they can.
 	// If the faction is closed an invite is required.
-	// Null means default for the universe.
+	// Null means default.
 	private Boolean open = null;
 	
 	// This is the ids of the invited players.
@@ -115,11 +115,11 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 	private Map<String, Rel> relationWishes = null;
 	
 	// The flag overrides are modifications to the default values.
-	// Null means default for the universe.
+	// Null means default.
 	private Map<FFlag, Boolean> flags = null;
 
 	// The perm overrides are modifications to the default values.
-	// Null means default for the universe.
+	// Null means default.
 	private Map<FPerm, Set<Rel>> perms = null;
 	
 	// -------------------------------------------- //
diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayer.java b/src/main/java/com/massivecraft/factions/entity/MPlayer.java
index 629fcd2b..fb483891 100644
--- a/src/main/java/com/massivecraft/factions/entity/MPlayer.java
+++ b/src/main/java/com/massivecraft/factions/entity/MPlayer.java
@@ -103,11 +103,11 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
 	
 	// This is a foreign key.
 	// Each player belong to a faction.
-	// Null means default for the universe.
+	// Null means default.
 	private String factionId = null;
 	
 	// What role does the player have in the faction?
-	// Null means default for the universe.
+	// Null means default.
 	private Rel role = null;
 	
 	// What title does the player have in the faction?
@@ -129,7 +129,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
 	// Each player has an individual power level.
 	// The power level for online players is occasionally updated by a recurring task and the power should stay the same for offline players.
 	// For that reason the value is to be considered correct when you pick it. Do not call the power update method.
-	// Null means default for the universe.
+	// Null means default.
 	private Double power = null;
 	
 	// Has this player requested an auto-updating ascii art map?
diff --git a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
index f06289b2..a9a6906e 100644
--- a/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
+++ b/src/main/java/com/massivecraft/factions/entity/MPlayerColl.java
@@ -29,7 +29,6 @@ public class MPlayerColl extends SenderColl<MPlayer>
 	
 	public void clean()
 	{
-		String universe = this.getUniverse();
 		for (MPlayer mplayer : this.getAll())
 		{
 			String factionId = mplayer.getFactionId();
@@ -37,7 +36,7 @@ public class MPlayerColl extends SenderColl<MPlayer>
 			
 			mplayer.resetFactionData();
 			
-			String message = Txt.parse("<i>Reset data for <h>%s <i>in <h>%s <i>universe. Unknown factionId <h>%s", mplayer.getDisplayName(IdUtil.getConsole()), universe, factionId);
+			String message = Txt.parse("<i>Reset data for <h>%s <i>. Unknown factionId <h>%s", mplayer.getDisplayName(IdUtil.getConsole()), factionId);
 			Factions.get().log(message);
 		}
 	}