diff --git a/sku.0/sys.server/compiled/game/script/gm/cmd.java b/sku.0/sys.server/compiled/game/script/gm/cmd.java
index 36b3d950c..590dc2e41 100755
--- a/sku.0/sys.server/compiled/game/script/gm/cmd.java
+++ b/sku.0/sys.server/compiled/game/script/gm/cmd.java
@@ -48,12 +48,6 @@ public class cmd extends script.base_script
     }
     public int cmdGetPlayerId(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 10)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /getPlayerId <player FIRST name>");
@@ -66,22 +60,14 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "getPlayerId: player '" + name + "' has object id: " + playerId);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "getPlayerId: The system was unable to find a player named '" + name + "'");
         }
-        
-	   }
-	   return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdAiIgnore(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
-    {   
-	  if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
+    {
         obj_id ship = getPilotedShip(self);
         if (hasObjVar(self, "gm"))
         {
@@ -93,7 +79,7 @@ public class cmd extends script.base_script
             }
             sendSystemMessageTestingOnly(self, "aiIgnore[OFF]: AI will now aggro you as normal and fight back.");
         }
-        else 
+        else
         {
             setObjVar(self, "gm", 1);
             if (isIdValid(ship))
@@ -104,17 +90,10 @@ public class cmd extends script.base_script
             }
             sendSystemMessageTestingOnly(self, "aiIgnore[ON]: AI will no longer aggro you or fight back.");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdForceCommand(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 10)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /forceCommand -target <command> <params> (with lookat target)");
@@ -124,7 +103,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /forceCommand -target <command> <params> (with lookat target)");
             return SCRIPT_CONTINUE;
@@ -143,8 +122,7 @@ public class cmd extends script.base_script
         }
         cmdParams.trim();
         sendSystemMessageTestingOnly(self, "/forceCommand: attempting to queue command: '" + cmd + " " + cmdParams + "' for (" + target + ")" + getName(target));
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdMoney(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
@@ -157,7 +135,7 @@ public class cmd extends script.base_script
         else if (d.isEmpty())
         {
         }
-        else 
+        else
         {
             params = d.getString("params");
             obj_id oid = d.getObjId("oid");
@@ -165,7 +143,7 @@ public class cmd extends script.base_script
             {
                 target = oid;
             }
-            else 
+            else
             {
                 target = self;
             }
@@ -197,7 +175,7 @@ public class cmd extends script.base_script
                 {
                     sendSystemMessageTestingOnly(self, "[CREDITS] Processing CASH update: (" + target + ")" + utils.getStringName(target) + " amt = " + sAmt);
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "[CREDITS] System rejected the CASH update: (" + target + ")" + utils.getStringName(target) + " amt = " + sAmt);
                 }
@@ -209,7 +187,7 @@ public class cmd extends script.base_script
                 {
                     sendSystemMessageTestingOnly(self, "[CREDITS] Processing BANK update: (" + target + ")" + utils.getStringName(target) + " amt = " + sAmt);
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "[CREDITS] System rejected the BANK update: (" + target + ")" + utils.getStringName(target) + " amt = " + sAmt);
                 }
@@ -237,7 +215,7 @@ public class cmd extends script.base_script
         {
             sendSystemMessagePlanetTestingOnly(params);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /broadcastPlanet <message>");
             return SCRIPT_CONTINUE;
@@ -251,7 +229,7 @@ public class cmd extends script.base_script
         {
             sendSystemMessageGalaxyTestingOnly(params);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /broadcastGalaxy <message>");
             return SCRIPT_CONTINUE;
@@ -260,12 +238,6 @@ public class cmd extends script.base_script
     }
     public int cmdBroadcastArea(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 10)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         final float MAX_RANGE = 256.0f;
         final String KEYWORD_RANGE = "-range:";
         float range = 0f;
@@ -288,7 +260,7 @@ public class cmd extends script.base_script
                 return SCRIPT_CONTINUE;
             }
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /broadcastArea -range:<radius> <message>");
             sendSystemMessageTestingOnly(self, "[Example] /broadcastArea -range:100 Hello world!");
@@ -312,7 +284,6 @@ public class cmd extends script.base_script
                 sendSystemMessageTestingOnly(players[i], message);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public dictionary parseRange(String params) throws InterruptedException
@@ -339,7 +310,7 @@ public class cmd extends script.base_script
                 String sRange = arg.substring(KEYWORD_RANGE.length());
                 retRange = utils.stringToFloat(sRange);
             }
-            else 
+            else
             {
                 retString += arg + " ";
             }
@@ -353,12 +324,6 @@ public class cmd extends script.base_script
     }
     public int cmdKill(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isMob(target))
         {
             sendSystemMessageTestingOnly(self, "/kill: you must have a valid creature target to use this command");
@@ -368,7 +333,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /kill -target");
             return SCRIPT_CONTINUE;
@@ -377,24 +342,17 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "/kill: you must use /killPlayer to kill a player!");
         }
-        else 
+        else
         {
             if (!isIncapacitated(target))
             {
                 setPosture(target, POSTURE_INCAPACITATED);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdKillPlayer(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || isDead(target))
         {
             sendSystemMessageTestingOnly(self, "/killPlayer: you must have a valid, alive player target to use this command");
@@ -404,24 +362,17 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /killPlayer -target");
             return SCRIPT_CONTINUE;
         }
         setPosture(target, POSTURE_INCAPACITATED);
         pclib.coupDeGrace(target, target, true, true);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdFreezePlayer(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {	
         if (params.indexOf(gm.KEYWORD_ID) > -1)
         {
             dictionary ret = gm.parseObjId(params);
@@ -435,21 +386,14 @@ public class cmd extends script.base_script
         {
             setState(target, STATE_FROZEN, true);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /freezePlayer [-target]|[-id:<oid>]");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdUnfreezePlayer(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (params.indexOf(gm.KEYWORD_ID) > -1)
         {
             dictionary ret = gm.parseObjId(params);
@@ -463,11 +407,10 @@ public class cmd extends script.base_script
         {
             setState(target, STATE_FROZEN, false);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /unfreezePlayer [-target]|[-id:<oid>]");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdShowFactionInformation(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
@@ -480,7 +423,7 @@ public class cmd extends script.base_script
             {
                 target = tmpTarget;
             }
-            else 
+            else
             {
                 target = self;
             }
@@ -506,12 +449,6 @@ public class cmd extends script.base_script
     }
     public int cmdSetFaction(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -520,7 +457,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             if (params.indexOf(gm.KEYWORD_ID) > -1)
             {
@@ -530,14 +467,14 @@ public class cmd extends script.base_script
                 {
                     target = tmpTarget;
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "/setFaction: Unable to parse a valid object id!");
                     return SCRIPT_CONTINUE;
                 }
                 params = d.getString("params");
             }
-            else 
+            else
             {
                 target = self;
             }
@@ -584,7 +521,7 @@ public class cmd extends script.base_script
             {
                 clearFlags = clearFlags;
             }
-            else 
+            else
             {
                 if (arg.equalsIgnoreCase("imperial"))
                 {
@@ -594,7 +531,7 @@ public class cmd extends script.base_script
                 {
                     faction = "Rebel";
                 }
-                else 
+                else
                 {
                     faction = arg;
                 }
@@ -614,14 +551,14 @@ public class cmd extends script.base_script
                         sendSystemMessageTestingOnly(self, "/setFaction: you must use '-adhoc' to set AIs to non-standard factions");
                         return SCRIPT_CONTINUE;
                     }
-                    else 
+                    else
                     {
                         sendSystemMessageTestingOnly(self, "/setFaction: attempting to update " + utils.getStringName(target) + "'s faction!");
                         factions.setFaction(target, faction);
                         return SCRIPT_CONTINUE;
                     }
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "/setFaction: you may not set players to adhoc factions!");
                     return SCRIPT_CONTINUE;
@@ -638,7 +575,7 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "/setFaction: assigning neutral status...");
             pvpMakeNeutral(target);
         }
-        else 
+        else
         {
             if (faction != null && !faction.equalsIgnoreCase("") && facNum != factions.AD_HOC_FACTION)
             {
@@ -647,7 +584,7 @@ public class cmd extends script.base_script
                 {
                     pvpSetAlignedFaction(target, factionHashCode);
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "/setFaction: unable to update " + utils.getStringName(target) + "'s faction to '" + faction + "'!");
                     return SCRIPT_CONTINUE;
@@ -661,7 +598,7 @@ public class cmd extends script.base_script
             {
                 pvpMakeOnLeave(target);
             }
-            else 
+            else
             {
                 pvpMakeCovert(target);
             }
@@ -671,17 +608,10 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "/setFaction: displaying " + utils.getStringName(target) + "'s updated faction information!");
             queueCommand(self, (-532090019), target, "", COMMAND_PRIORITY_DEFAULT);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetFactionStanding(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -690,7 +620,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -745,14 +675,14 @@ public class cmd extends script.base_script
                 sendSystemMessageTestingOnly(self, "/setFactionStanding: you may not set standing to non-standard factions");
                 return SCRIPT_CONTINUE;
             }
-            else 
+            else
             {
                 if (mod != 0)
                 {
                     sendSystemMessageTestingOnly(self, "/setFactionStanding: modifying '" + faction + "' by " + amt);
                     factions.addFactionStanding(target, faction, amt);
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "/setFactionStanding: setting '" + faction + "' to " + amt);
                     factions.setFactionStanding(target, faction, amt);
@@ -761,7 +691,6 @@ public class cmd extends script.base_script
         }
         sendSystemMessageTestingOnly(self, "/setFactionStanding: displaying " + utils.getStringName(target) + "'s updated faction information!");
         queueCommand(self, (-532090019), target, "", COMMAND_PRIORITY_DEFAULT);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGetRank(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
@@ -777,12 +706,6 @@ public class cmd extends script.base_script
     }
     public int cmdSetRank(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (utils.hasScriptVar(self, "setRank.pid"))
         {
             int oldpid = utils.getIntScriptVar(self, "setRank.pid");
@@ -797,7 +720,7 @@ public class cmd extends script.base_script
         else if (d.isEmpty())
         {
         }
-        else 
+        else
         {
             params = d.getString("params");
             obj_id oid = d.getObjId("oid");
@@ -805,7 +728,7 @@ public class cmd extends script.base_script
             {
                 target = oid;
             }
-            else 
+            else
             {
                 target = self;
             }
@@ -847,21 +770,14 @@ public class cmd extends script.base_script
             int urank = pvpGetCurrentGcwRank(target);
             sendSystemMessageTestingOnly(self, "(" + target + ") " + getName(target) + "'s rank updated to (" + urank + ") " + getString(new string_id("faction_recruiter", factions.getRankName(urank, faction))));
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "The system was unable to update (" + target + ") " + getName(target) + "'s rank updated to (" + newrank + ") " + getString(new string_id("faction_recruiter", factions.getRankName(newrank, faction))));
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGrantSkill(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -870,7 +786,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -883,17 +799,10 @@ public class cmd extends script.base_script
         prompt += "Please choose an option:";
         int pid = sui.listbox(self, self, prompt, sui.OK_CANCEL, "GM GRANT SKILL", gm.ROADMAP_SKILL_OPTIONS, "handleGmGrantSkillOptions", true, false);
         utils.setScriptVar(self, "gmGrantSkill.target", target);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdRevokeSkill(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -902,7 +811,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -931,8 +840,7 @@ public class cmd extends script.base_script
         revokeSkill(target, params);
         sendSystemMessageTestingOnly(self, "You revoke " + params + " from (" + target + ") " + utils.getStringName(target));
         CustomerServiceLog("Skill", "CSR: (" + self + ") " + getName(self) + " has revoked skill '" + params + "' from (" + target + ") " + utils.getStringName(target));
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public void listSkills(obj_id self, String[] skills) throws InterruptedException
     {
@@ -1029,12 +937,6 @@ public class cmd extends script.base_script
     }
     public int cmdSetSpeed(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1043,7 +945,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1087,17 +989,10 @@ public class cmd extends script.base_script
         }
         float newSpeed = getMovementPercent(target);
         sendSystemMessageTestingOnly(self, "(" + target + ") " + utils.getStringName(target) + "'s new speed multiplier = " + newSpeed);
-	   }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdSetName(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1106,7 +1001,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1116,17 +1011,10 @@ public class cmd extends script.base_script
             return SCRIPT_CONTINUE;
         }
         setName(target, params);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetFirstName(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1135,7 +1023,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1167,28 +1055,21 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "/setFirstName: name NOT updated...");
         }
-        else 
+        else
         {
             if (setName(target, newname))
             {
                 sendSystemMessageTestingOnly(self, "/setFirstName: " + name + " will now be known as " + newname);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "/setFirstName: system disallowed name change...");
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetLastName(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1197,7 +1078,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1223,28 +1104,21 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "/setLastName: name NOT updated...");
         }
-        else 
+        else
         {
             if (setName(target, newname))
             {
                 sendSystemMessageTestingOnly(self, "/setLastName: " + name + " will now be known as " + newname);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "/setLastName: system disallowed name change...");
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGrantBadge(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 10)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1253,7 +1127,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1273,7 +1147,7 @@ public class cmd extends script.base_script
         {
             badgeName = params;
         }
-        else 
+        else
         {
             badgeName = getCollectionSlotName(idx);
         }
@@ -1286,21 +1160,14 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "/grantBadge: you grant badge " + badgeName + " to (" + target + ")" + utils.getStringName(target));
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "/grantBadge: you are UNABLE to grant badge " + badgeName + " to (" + target + ")" + utils.getStringName(target));
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdRevokeBadge(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1309,7 +1176,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1339,11 +1206,10 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "/revokeBadge: you revoke badge #" + idx + " from (" + target + ")" + utils.getStringName(target));
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "/revokeBadge: you are UNABLE to revoke badge #" + idx + " from (" + target + ")" + utils.getStringName(target));
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdShowExperience(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
@@ -1377,12 +1243,6 @@ public class cmd extends script.base_script
     }
     public int cmdSetExperience(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1391,7 +1251,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1459,7 +1319,7 @@ public class cmd extends script.base_script
                     amt = -amt;
                 }
             }
-            else 
+            else
             {
                 amt = utils.stringToInt(sAmt);
                 if (amt == -1)
@@ -1476,7 +1336,6 @@ public class cmd extends script.base_script
                 xp.grantUnmodifiedExperience(target, xp_type, amt, "cmdSetExperienceResult", resultData);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public void showSetExperienceSyntax(obj_id self) throws InterruptedException
@@ -1486,84 +1345,56 @@ public class cmd extends script.base_script
     }
     public int cmdFindObject(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         obj_id objToFind = utils.stringToObjId(params);
         if (!isIdValid(objToFind))
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /findObject objid");
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "Searching for object: " + objToFind);
             gm.attachHandlerScript(self);
             findObjectAnywhere(objToFind, self);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdFindObjectByTemplate(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         java.util.StringTokenizer st = new java.util.StringTokenizer(params);
         if (st.countTokens() != 1)
         {
             sendSystemMessageTestingOnly(self, "Format: findObjectByTemplate <template name>, like \"findObjectByTemplate object/mobile/meatlump_brother_lempi.iff\"");
         }
-        else 
+        else
         {
             String templateName = st.nextToken();
             sendConsoleMessage(self, "Searching for object by template name: " + templateName);
             gm.attachHandlerScript(self);
             findObjectAnywhereByTemplate(templateName, self);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdFindPlayer(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         java.util.StringTokenizer st = new java.util.StringTokenizer(params);
         if (st.countTokens() != 1)
         {
             sendSystemMessageTestingOnly(self, "Format: findPlayer <player name|*>, where * will find all players");
         }
-        else 
+        else
         {
             String partialName = st.nextToken();
             sendConsoleMessage(self, "Searching for players with name containing: " + partialName);
             gm.attachHandlerScript(self);
             findPlayerAnywhereByPartialName(partialName, self);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdFindWarden(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         sendConsoleMessage(self, "Searching for wardens");
         gm.attachHandlerScript(self);
         findWardenAnywhere(self);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdFindCreature(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
@@ -1573,7 +1404,7 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "Format: findCreature <creature name>, like \"findCreature gnort\"");
         }
-        else 
+        else
         {
             String creatureName = st.nextToken();
             sendConsoleMessage(self, "Searching for creature: " + creatureName);
@@ -1584,12 +1415,6 @@ public class cmd extends script.base_script
     }
     public int cmdWipeItems(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = self;
@@ -1598,7 +1423,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             target = self;
         }
@@ -1612,17 +1437,10 @@ public class cmd extends script.base_script
             utils.setScriptVar(self, gm.SCRIPTVAR_WIPEITEMS_TARGET, target);
             gm.attachHandlerScript(self);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdAdjustLotCount(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             target = getLookAtTarget(self);
@@ -1642,7 +1460,7 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "Format: adjustLotCount <amount>");
         }
-        else 
+        else
         {
             String amount_str = st.nextToken();
             int amount = utils.stringToInt(amount_str);
@@ -1650,24 +1468,17 @@ public class cmd extends script.base_script
             int lots = getAccountNumLots(getPlayerObject(target));
             sendSystemMessageTestingOnly(self, "Lot count adjusted on " + target + " by " + amount + ". New lot count is " + lots);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdEditBankAccount(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         LOG("LOG_CHANNEL", "cmdEditBankAccount");
         java.util.StringTokenizer st = new java.util.StringTokenizer(params);
         if (st.countTokens() != 2)
         {
             sendSystemMessageTestingOnly(self, "Format: editMoney <player name> <amount>");
         }
-        else 
+        else
         {
             String name = st.nextToken();
             String amount_str = st.nextToken();
@@ -1676,7 +1487,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Format: editMoney <player name> <amount>");
             }
-            else 
+            else
             {
                 LOG("LOG_CHANNEL", "handleEditBankAccount");
                 String firstName = name.toLowerCase();
@@ -1694,12 +1505,12 @@ public class cmd extends script.base_script
                         sendSystemMessageTestingOnly(self, "Requesting credit transfer of " + amount + " to " + firstName + " (" + playerId + ")");
                         CustomerServiceLog("money", getFirstName(self) + " (" + self + ") requested a transfer of " + amount + " credits to " + firstName + "(" + playerId + ")");
                     }
-                    else 
+                    else
                     {
                         sendSystemMessageTestingOnly(self, "Transfer failed.");
                     }
                 }
-                else 
+                else
                 {
                     amount = amount * -1;
                     if (money.bankTo(playerId, money.ACCT_CUSTOMER_SERVICE, amount))
@@ -1710,17 +1521,10 @@ public class cmd extends script.base_script
                 }
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetHue(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         boolean parseTarget = false;
         if (!isIdValid(target))
         {
@@ -1730,19 +1534,19 @@ public class cmd extends script.base_script
                 target = ret.getObjId("oid");
                 params = ret.getString("params");
             }
-            else 
+            else
             {
                 showSetHueSyntax(self);
                 return SCRIPT_CONTINUE;
             }
         }
-        else 
+        else
         {
             if (params.indexOf(gm.KEYWORD_TARGET) > -1)
             {
                 params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
             }
-            else 
+            else
             {
                 showSetHueSyntax(self);
                 return SCRIPT_CONTINUE;
@@ -1789,7 +1593,7 @@ public class cmd extends script.base_script
             {
                 showVarIdxUI = false;
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "/setHue: (" + target + ")" + utils.getStringName(target) + " does not have var index #" + varIdx);
             }
@@ -1822,7 +1626,7 @@ public class cmd extends script.base_script
             {
                 showPalIdxUI = false;
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "/setHue: (" + target + ")" + utils.getStringName(target) + " pal range is " + min + " to " + max);
             }
@@ -1837,7 +1641,6 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "/setHue: attempting to hue " + target + "'s " + varIdxPath + " to " + palIdx);
             ri.setValue(palIdx);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public void showSetHueSyntax(obj_id self) throws InterruptedException
@@ -1847,18 +1650,12 @@ public class cmd extends script.base_script
     }
     public int cmdGoto(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         dictionary d = new dictionary();
         if (params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /goto <target>");
         }
-        else 
+        else
         {
             StringTokenizer st = new StringTokenizer(params);
             String oid = st.nextToken();
@@ -1878,7 +1675,6 @@ public class cmd extends script.base_script
                 locateObject(obj, "onObjectLocateResponseForCmdGoto", d);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int onObjectLocateResponseForCmdGoto(obj_id self, dictionary params) throws InterruptedException
@@ -1892,12 +1688,6 @@ public class cmd extends script.base_script
     }
     public int cmdSetPlayerState(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /setPlayerState -target (with lookat target)");
@@ -1907,24 +1697,17 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /setPlayerState -target (with lookat target)");
             return SCRIPT_CONTINUE;
         }
         gm.attachHandlerScript(self);
         gm.showSetPlayerStateUI(target);
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdUnCityBan(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             if (params.indexOf(gm.KEYWORD_ID) > -1)
@@ -1933,12 +1716,12 @@ public class cmd extends script.base_script
                 target = ret.getObjId("oid");
                 params = ret.getString("params");
             }
-            else 
+            else
             {
                 target = self;
             }
         }
-        else 
+        else
         {
             if (params.indexOf(gm.KEYWORD_TARGET) > -1)
             {
@@ -1950,7 +1733,7 @@ public class cmd extends script.base_script
                 target = ret.getObjId("oid");
                 params = ret.getString("params");
             }
-            else 
+            else
             {
                 target = self;
             }
@@ -1978,22 +1761,14 @@ public class cmd extends script.base_script
             CustomerServiceLog("player_city", "CSR: %TU has unbanned %TT from " + cityGetName(cityID) + "(" + cityID + "/" + cityGetCityHall(cityID) + ")", self, target);
             return SCRIPT_CONTINUE;
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Error] /unCityBan: You were not able to unban " + getFirstName(target) + " from " + cityGetName(cityID));
             return SCRIPT_CONTINUE;
         }
-	   }
-	  return SCRIPT_CONTINUE;
     }
     public int cmdInvulnerable(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-       if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {		
         obj_id ship = getPilotedShip(self);
         if (hasObjVar(self, "invulnerable"))
         {
@@ -2005,7 +1780,7 @@ public class cmd extends script.base_script
             }
             sendSystemMessageTestingOnly(self, "Invulnerability[OFF]: You are no longer invulnerable.");
         }
-        else 
+        else
         {
             setObjVar(self, "invulnerable", 1);
             setInvulnerable(self, true);
@@ -2015,17 +1790,10 @@ public class cmd extends script.base_script
             }
             sendSystemMessageTestingOnly(self, "Invulnerability[ON]: You are now invulnerable.");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetTef(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target))
         {
             sendSystemMessageTestingOnly(self, "[Error] /setTEF: You must target a declared member of a PVP faction to use this command");
@@ -2035,7 +1803,7 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /setTEF -target");
             return SCRIPT_CONTINUE;
@@ -2064,17 +1832,10 @@ public class cmd extends script.base_script
         }
         pvpSetPersonalEnemyFlag(self, target);
         sendSystemMessageTestingOnly(self, "A temporary enemy flag has been set against your current target (OID: " + target + ")");
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdInitializeComponent(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         LOG("LOG_CHANNEL", "cmdInitializeComponent -- " + params);
         if (!isIdValid(target))
         {
@@ -2159,7 +1920,7 @@ public class cmd extends script.base_script
             {
                 prefix = new string_id("obj_n", "legendary_prefix");
             }
-            else 
+            else
             {
                 prefix = new string_id("obj_n", "exceptional_prefix");
             }
@@ -2168,17 +1929,10 @@ public class cmd extends script.base_script
         }
         CustomerServiceLog("loot", "CSR: %TU has created %TT at level " + level + " and at rarity bonus " + bonus, self, target);
         sendSystemMessageTestingOnly(self, "Component initialization complete.");
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGmWeapon(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         trace.log("Weapons", "gm.cmdGmWeapon -->> " + params, self, trace.TL_WARNING);
         if (params == null || params.length() < 1)
         {
@@ -2258,7 +2012,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Error creating weapon with supplied ID (" + schematicId + ").");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Weapon " + schematicId + " created.");
             }
@@ -2297,7 +2051,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Successfully created " + numUses + " use draft schematic for item " + schematicId + " for skill " + requiredSkill + ".");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Error creating limited use draft schematic for " + schematicId + ".");
             }
@@ -2311,21 +2065,14 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "	limUseSchematic <weapon_id> <numUses> <optional: skillRequired> -- Creates a limited use draft schematic.");
             return SCRIPT_CONTINUE;
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "format: /cmdGmWeapon <command> (params)   OR   /cmdGmWeapon ? for help");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGMFsVillage(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         trace.log(fs_dyn_village.LOG_CHAN, "gm.cmdGMFsVillage -->> " + params, self, trace.TL_WARNING);
         if (params == null || params.length() < 1)
         {
@@ -2424,7 +2171,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Waypoint datapad created.");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Datapad creation failed.  Overloaded inventory, maybe?.");
             }
@@ -2437,7 +2184,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Frequency datapad created.");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Datapad creation failed.  Overloaded inventory, maybe?.");
             }
@@ -2473,7 +2220,7 @@ public class cmd extends script.base_script
                     setObjVar(remote, fs_counterstrike.OBJVAR_CAMP_NAME, key);
                     utils.putInPlayerInventory(self, remote);
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "Remote creation failed.  Overloaded inventory, maybe?.");
                 }
@@ -2505,17 +2252,17 @@ public class cmd extends script.base_script
                     {
                         sendSystemMessageTestingOnly(self, "All FS quest data cleared from " + target);
                     }
-                    else 
+                    else
                     {
                         sendSystemMessageTestingOnly(self, "Data clear failed.");
                     }
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, usage);
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, usage);
             }
@@ -2618,33 +2365,33 @@ public class cmd extends script.base_script
             switch (typeCrc)
             {
                 case (317755815):
-                template = (938424352);
-                attribs.add("crafting_components.res_conductivity");
-                attribs.add("crafting_components.res_decay_resist");
-                attribs.add("crafting_components.res_quality");
-                attribs.add("crafting_components.res_shock_resistance");
-                break;
+                    template = (938424352);
+                    attribs.add("crafting_components.res_conductivity");
+                    attribs.add("crafting_components.res_decay_resist");
+                    attribs.add("crafting_components.res_quality");
+                    attribs.add("crafting_components.res_shock_resistance");
+                    break;
                 case (-1421690251):
-                template = (131111149);
-                attribs.add("crafting_components.res_potential_energy");
-                attribs.add("crafting_components.res_quality");
-                break;
+                    template = (131111149);
+                    attribs.add("crafting_components.res_potential_energy");
+                    attribs.add("crafting_components.res_quality");
+                    break;
                 case (-1146082608):
-                template = (-1867424837);
-                attribs.add("crafting_components.res_malleability");
-                attribs.add("crafting_components.res_quality");
-                break;
+                    template = (-1867424837);
+                    attribs.add("crafting_components.res_malleability");
+                    attribs.add("crafting_components.res_quality");
+                    break;
                 case (460212386):
-                template = (742613618);
-                attribs.add("crafting_components.res_potential_energy");
-                break;
+                    template = (742613618);
+                    attribs.add("crafting_components.res_potential_energy");
+                    break;
                 case (-847505801):
                 default:
-                template = (530364865);
-                attribs.add("crafting_components.res_malleability");
-                attribs.add("crafting_components.res_quality");
-                attribs.add("crafting_components.res_toughness");
-                break;
+                    template = (530364865);
+                    attribs.add("crafting_components.res_malleability");
+                    attribs.add("crafting_components.res_quality");
+                    attribs.add("crafting_components.res_toughness");
+                    break;
             }
             obj_id inventory = utils.getInventoryContainer(self);
             obj_id resource = createObject(template, inventory, "");
@@ -2655,7 +2402,7 @@ public class cmd extends script.base_script
                     setObjVar(resource, (String)(attribs.get(i)), rand(500, 1000));
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Error creating resource template crc " + template);
             }
@@ -2683,21 +2430,14 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "    unlockbranch -- unlocks a branch on the specified player.");
             return SCRIPT_CONTINUE;
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "Format: /gmFsVillage <command> (params)    /gmFsVillage ? for help");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGMForceRank(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         LOG("force_rank", "gm.cmdGMForceRank -- " + params);
         if (params == null || params.length() < 1)
         {
@@ -2734,7 +2474,7 @@ public class cmd extends script.base_script
                     LOG("force_rank", "Min XP for rank " + (curRank + 1) + " is " + (force_rank.getForceRankMinXp(curRank + 1)) + ".");
                     newXP = (int)Math.floor(force_rank.getForceRankMinXp(curRank + 1) * 1.5f);
                 }
-                else 
+                else
                 {
                     LOG("force_rank", "Min XP for rank " + (curRank + 2) + " is " + (force_rank.getForceRankMinXp(curRank + 2)) + ".");
                     newXP = (int)Math.floor(force_rank.getForceRankMinXp(curRank + 2) * 1.5f);
@@ -2742,7 +2482,7 @@ public class cmd extends script.base_script
                 force_rank.adjustForceRankXP(target, newXP - curXP);
                 sendSystemMessageTestingOnly(self, "Promotion initiated.  This may take a minute or so.");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Promotion failed.");
             }
@@ -2757,7 +2497,7 @@ public class cmd extends script.base_script
                     sendSystemMessageTestingOnly(self, "You must have a target or specify a player name.");
                     return SCRIPT_CONTINUE;
                 }
-                else 
+                else
                 {
                     String player_name = st.nextToken();
                     if (player_name == null || player_name.length() < 1)
@@ -2782,13 +2522,13 @@ public class cmd extends script.base_script
                         sendSystemMessageTestingOnly(self, "You cannot demote a player that is not of at least Rank 1.");
                         return SCRIPT_CONTINUE;
                     }
-                    else 
+                    else
                     {
                         if (force_rank.demoteForceRank(enclave, player_name, player_rank - 1))
                         {
                             sendSystemMessageTestingOnly(self, "Demotion initiated.  This may take a minute or so.");
                         }
-                        else 
+                        else
                         {
                             sendSystemMessageTestingOnly(self, "Demotion failed.");
                         }
@@ -2815,7 +2555,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Demotion initiated.  This may take a minute or so.");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Demotion failed.");
             }
@@ -2829,7 +2569,7 @@ public class cmd extends script.base_script
                 sendSystemMessageTestingOnly(self, "Format: /gmForceRank pulseMaint <council>    1 for DARK, 2 for LIGHT");
                 return SCRIPT_CONTINUE;
             }
-            else 
+            else
             {
                 council = utils.stringToInt(st.nextToken());
                 if (council != 1 && council != 2)
@@ -2849,7 +2589,7 @@ public class cmd extends script.base_script
                 sendSystemMessageTestingOnly(self, "Format: /gmForceRank add <council>    1 for DARK, 2 for LIGHT");
                 return SCRIPT_CONTINUE;
             }
-            else 
+            else
             {
                 council = utils.stringToInt(st.nextToken());
                 if (council != 1 && council != 2)
@@ -2877,7 +2617,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Add to FRS complete.");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Add to FRS failed.");
             }
@@ -2904,7 +2644,7 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "Removal complete.");
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Removal failed.");
             }
@@ -3027,7 +2767,7 @@ public class cmd extends script.base_script
                 scores[rankIdx] = score;
                 setObjVar(target, arena.VAR_RANK_CHALLENGE_SCORES, scores);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Format: /gmForceRank setChallengeScore <rank 2-11> <score>");
                 return SCRIPT_CONTINUE;
@@ -3048,11 +2788,10 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "	setChallengeScore -- sets the challenge score for a given rank. (God level 10)");
             return SCRIPT_CONTINUE;
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "format: /gmForceRank <command>    /gmForceRank ? for help");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int msgGotIntResponse(obj_id self, dictionary params) throws InterruptedException
@@ -3077,7 +2816,7 @@ public class cmd extends script.base_script
             }
             return SCRIPT_CONTINUE;
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "Failed to find integer '" + key + "' cluster wide data.  Value might not have been registered yet.");
         }
@@ -3184,7 +2923,7 @@ public class cmd extends script.base_script
             {
                 loc = campLocs[i];
             }
-            else 
+            else
             {
                 loc = null;
             }
@@ -3196,7 +2935,7 @@ public class cmd extends script.base_script
             {
                 id = campIds[i];
             }
-            else 
+            else
             {
                 id = null;
             }
@@ -3206,12 +2945,6 @@ public class cmd extends script.base_script
     }
     public int msgActivatePhase(obj_id self, dictionary params) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!utils.hasScriptVar(self, "gm.cmd.fs_village.wantPhase"))
         {
             return SCRIPT_CONTINUE;
@@ -3241,8 +2974,7 @@ public class cmd extends script.base_script
         fs_dyn_village.setNextPhaseAuth(target, phase);
         fs_dyn_village.pushAndInitPhase(target);
         sendSystemMessageGalaxyOob("If you are currently on a Force Sensititivy training quest, you should log out now and log back in at this time.  The village phase has been changed and you will not be able to complete your current quest at this time.");
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int msgGotIdResponse(obj_id self, dictionary params) throws InterruptedException
     {
@@ -3266,7 +2998,7 @@ public class cmd extends script.base_script
             }
             return SCRIPT_CONTINUE;
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "Failed to find obj id '" + key + "' cluster wide data.  Id might not have been registered yet.");
         }
@@ -3286,7 +3018,7 @@ public class cmd extends script.base_script
         {
             sendSystemMessageTestingOnly(self, "Successfully registered " + id + " under key " + key);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "FAILED to register " + id + " under key " + key);
         }
@@ -3382,12 +3114,6 @@ public class cmd extends script.base_script
     }
     public int cmdHasVeteranReward(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!("true").equalsIgnoreCase(getConfigSetting("GameServer", "enableVeteranRewards")))
         {
             return SCRIPT_CONTINUE;
@@ -3406,27 +3132,20 @@ public class cmd extends script.base_script
                 {
                     sendSystemMessage(self, veteran_deprecated.SID_HAS_MILESTONE);
                 }
-                else 
+                else
                 {
                     sendSystemMessage(self, veteran_deprecated.SID_HAS_NOT_MILESTONE);
                 }
             }
-            else 
+            else
             {
                 sendSystemMessage(self, veteran_deprecated.SID_MILESTONE_OUT_OF_RANGE);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetVeteranReward(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!("true").equalsIgnoreCase(getConfigSetting("GameServer", "enableVeteranRewards")))
         {
             return SCRIPT_CONTINUE;
@@ -3445,22 +3164,15 @@ public class cmd extends script.base_script
                 veteran_deprecated.setVeteranMilestone(target, milestone);
                 sendSystemMessage(self, veteran_deprecated.SID_OK);
             }
-            else 
+            else
             {
                 sendSystemMessage(self, veteran_deprecated.SID_MILESTONE_OUT_OF_RANGE);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdClearVeteranReward(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!("true").equalsIgnoreCase(getConfigSetting("GameServer", "enableVeteranRewards")))
         {
             return SCRIPT_CONTINUE;
@@ -3479,22 +3191,15 @@ public class cmd extends script.base_script
                 veteran_deprecated.clearVeteranMilestone(target, milestone);
                 sendSystemMessage(self, veteran_deprecated.SID_OK);
             }
-            else 
+            else
             {
                 sendSystemMessage(self, veteran_deprecated.SID_MILESTONE_OUT_OF_RANGE);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdOverrideActiveMonths(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!("true").equalsIgnoreCase(getConfigSetting("GameServer", "enableVeteranRewards")))
         {
             return SCRIPT_CONTINUE;
@@ -3513,7 +3218,7 @@ public class cmd extends script.base_script
                 removeObjVar(self, veteran_deprecated.OBJVAR_TIME_ACTIVE);
                 sendSystemMessage(self, veteran_deprecated.SID_ACTIVE_MONTHS_CLEARED);
             }
-            else 
+            else
             {
                 int days = months * veteran_deprecated.DAYS_PER_MONTH;
                 setObjVar(self, veteran_deprecated.OBJVAR_FAKE_VETERAN_TOTAL_TIME, days);
@@ -3524,7 +3229,6 @@ public class cmd extends script.base_script
                 sendSystemMessage(self, veteran_deprecated.SID_OK);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int parseMilestone(String params) throws InterruptedException
@@ -3534,25 +3238,19 @@ public class cmd extends script.base_script
         switch (st.countTokens())
         {
             case 1:
-            milestone = st.nextToken();
-            break;
+                milestone = st.nextToken();
+                break;
             case 2:
-            st.nextToken();
-            milestone = st.nextToken();
-            break;
+                st.nextToken();
+                milestone = st.nextToken();
+                break;
             default:
-            return -1;
+                return -1;
         }
         return (Integer.valueOf(milestone)).intValue();
     }
     public int cmdResetJedi(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /resetJedi -target (with lookat target)");
@@ -3562,28 +3260,21 @@ public class cmd extends script.base_script
         {
             params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /resetJedi -target (with lookat target)");
             return SCRIPT_CONTINUE;
         }
         gm.cmdResetJedi(target);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdDeactivateQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[syntax] /deactivateQuest <questName>");
         }
-        else 
+        else
         {
             LOG("newquests", "deactivating quest " + params + " for " + target);
             int id = quests.getQuestId(params);
@@ -3592,27 +3283,20 @@ public class cmd extends script.base_script
                 quests.deactivate(params, target);
                 sendSystemMessageTestingOnly(self, "deactivated quest " + params);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "failed to find quest " + params);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdActivateQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[syntax] /activateQuest <questName>");
         }
-        else 
+        else
         {
             LOG("newquests", "activating quest " + params + " for " + target);
             int id = quests.getQuestId(params);
@@ -3621,27 +3305,20 @@ public class cmd extends script.base_script
                 quests.activate(params, target, null);
                 sendSystemMessageTestingOnly(self, "activated quest " + params);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "failed to find quest " + params);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdListActiveQuests(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target))
         {
             sendSystemMessageTestingOnly(self, "[syntax] /listActiveQuests");
         }
-        else 
+        else
         {
             String datatable = "datatables/player/quests.iff";
             int rows = dataTableGetNumRows(datatable);
@@ -3661,7 +3338,7 @@ public class cmd extends script.base_script
                         {
                             msg += questName;
                         }
-                        else 
+                        else
                         {
                             msg += "unknown";
                         }
@@ -3670,7 +3347,7 @@ public class cmd extends script.base_script
                         {
                             msg += questSummary;
                         }
-                        else 
+                        else
                         {
                             msg += "missing summary string";
                         }
@@ -3682,28 +3359,21 @@ public class cmd extends script.base_script
                     sendSystemMessageTestingOnly(self, "no active quests");
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "no active quests");
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdClearCompletedQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         LOG("newquests", "received /clearCompletedQuest");
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[syntax] /clearCompletedQuest <questName>");
         }
-        else 
+        else
         {
             LOG("newquests", "clearing quest " + params + " for " + target);
             int id = quests.getQuestId(params);
@@ -3713,28 +3383,21 @@ public class cmd extends script.base_script
                 sendSystemMessageTestingOnly(self, "cleared quest " + params);
                 LOG("newquests", "cleared quest " + params + " for player " + target);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "failed to find quest " + params);
                 LOG("newquests", "failed to clear quest " + params + " for player " + target);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdCompleteQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
         {
             sendSystemMessageTestingOnly(self, "[syntax] /deactivateQuest <questName>");
         }
-        else 
+        else
         {
             LOG("newquests", "deactivating quest " + params + " for " + target);
             int id = quests.getQuestId(params);
@@ -3743,27 +3406,20 @@ public class cmd extends script.base_script
                 quests.complete(params, target, true);
                 sendSystemMessageTestingOnly(self, "completed quest " + params);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "failed to find quest " + params);
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdListCompletedQuests(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isIdValid(target) || !isPlayer(target))
         {
             sendSystemMessageTestingOnly(self, "[syntax] /listActiveQuests");
         }
-        else 
+        else
         {
             String datatable = "datatables/player/quests.iff";
             int rows = dataTableGetNumRows(datatable);
@@ -3783,7 +3439,7 @@ public class cmd extends script.base_script
                         {
                             msg += questName;
                         }
-                        else 
+                        else
                         {
                             msg += "unknown";
                         }
@@ -3792,7 +3448,7 @@ public class cmd extends script.base_script
                         {
                             msg += questSummary;
                         }
-                        else 
+                        else
                         {
                             msg += "missing summary string";
                         }
@@ -3804,53 +3460,46 @@ public class cmd extends script.base_script
                     sendSystemMessageTestingOnly(self, "no complete quests");
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "no complete quests");
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGrantPadawanTrialsEligibility(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
-        String[] fs_skills = 
-        {
-            "force_title_jedi_novice",
-            "force_sensitive_combat_prowess_novice",
-            "force_sensitive_combat_prowess_melee_accuracy_01",
-            "force_sensitive_combat_prowess_melee_accuracy_02",
-            "force_sensitive_combat_prowess_melee_accuracy_03",
-            "force_sensitive_combat_prowess_melee_accuracy_04",
-            "force_sensitive_combat_prowess_melee_speed_01",
-            "force_sensitive_combat_prowess_melee_speed_02",
-            "force_sensitive_combat_prowess_melee_speed_03",
-            "force_sensitive_combat_prowess_melee_speed_04",
-            "force_sensitive_enhanced_reflexes_novice",
-            "force_sensitive_enhanced_reflexes_ranged_defense_01",
-            "force_sensitive_enhanced_reflexes_ranged_defense_02",
-            "force_sensitive_enhanced_reflexes_ranged_defense_03",
-            "force_sensitive_enhanced_reflexes_ranged_defense_04",
-            "force_sensitive_enhanced_reflexes_melee_defense_01",
-            "force_sensitive_enhanced_reflexes_melee_defense_02",
-            "force_sensitive_enhanced_reflexes_melee_defense_03",
-            "force_sensitive_enhanced_reflexes_melee_defense_04",
-            "force_sensitive_heightened_senses_novice",
-            "force_sensitive_heightened_senses_surveying_01",
-            "force_sensitive_heightened_senses_surveying_02",
-            "force_sensitive_heightened_senses_surveying_03",
-            "force_sensitive_heightened_senses_surveying_04",
-            "force_sensitive_heightened_senses_luck_01",
-            "force_sensitive_heightened_senses_luck_02",
-            "force_sensitive_heightened_senses_luck_03",
-            "force_sensitive_heightened_senses_luck_04"
-        };
+        String[] fs_skills =
+                {
+                        "force_title_jedi_novice",
+                        "force_sensitive_combat_prowess_novice",
+                        "force_sensitive_combat_prowess_melee_accuracy_01",
+                        "force_sensitive_combat_prowess_melee_accuracy_02",
+                        "force_sensitive_combat_prowess_melee_accuracy_03",
+                        "force_sensitive_combat_prowess_melee_accuracy_04",
+                        "force_sensitive_combat_prowess_melee_speed_01",
+                        "force_sensitive_combat_prowess_melee_speed_02",
+                        "force_sensitive_combat_prowess_melee_speed_03",
+                        "force_sensitive_combat_prowess_melee_speed_04",
+                        "force_sensitive_enhanced_reflexes_novice",
+                        "force_sensitive_enhanced_reflexes_ranged_defense_01",
+                        "force_sensitive_enhanced_reflexes_ranged_defense_02",
+                        "force_sensitive_enhanced_reflexes_ranged_defense_03",
+                        "force_sensitive_enhanced_reflexes_ranged_defense_04",
+                        "force_sensitive_enhanced_reflexes_melee_defense_01",
+                        "force_sensitive_enhanced_reflexes_melee_defense_02",
+                        "force_sensitive_enhanced_reflexes_melee_defense_03",
+                        "force_sensitive_enhanced_reflexes_melee_defense_04",
+                        "force_sensitive_heightened_senses_novice",
+                        "force_sensitive_heightened_senses_surveying_01",
+                        "force_sensitive_heightened_senses_surveying_02",
+                        "force_sensitive_heightened_senses_surveying_03",
+                        "force_sensitive_heightened_senses_surveying_04",
+                        "force_sensitive_heightened_senses_luck_01",
+                        "force_sensitive_heightened_senses_luck_02",
+                        "force_sensitive_heightened_senses_luck_03",
+                        "force_sensitive_heightened_senses_luck_04"
+                };
         fs_quests.makeVillageEligible(self);
         setJediState(self, JEDI_STATE_FORCE_SENSITIVE);
         for (int i = 0; i < fs_skills.length; i++)
@@ -3868,7 +3517,6 @@ public class cmd extends script.base_script
         }
         String str_msg = "You have been granted eligibility for the Jedi Padawan trials." + " This included being given the required skills and flags that mark eligibility.";
         sendSystemMessage(self, str_msg, "");
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGetGameTime(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
@@ -3878,12 +3526,6 @@ public class cmd extends script.base_script
     }
     public int gmJediState(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (params == null || params.length() < 1)
         {
             sendSystemMessageTestingOnly(self, "format: /gmJediState <command>    /gmJediState ? for help");
@@ -3908,20 +3550,20 @@ public class cmd extends script.base_script
             switch (jedi_state)
             {
                 case JEDI_STATE_FORCE_SENSITIVE:
-                sendSystemMessageTestingOnly(self, getFirstName(target) + " is Force-sensitive.");
-                break;
+                    sendSystemMessageTestingOnly(self, getFirstName(target) + " is Force-sensitive.");
+                    break;
                 case JEDI_STATE_JEDI:
-                sendSystemMessageTestingOnly(self, getFirstName(target) + " is a Jedi.");
-                break;
+                    sendSystemMessageTestingOnly(self, getFirstName(target) + " is a Jedi.");
+                    break;
                 case JEDI_STATE_FORCE_RANKED_LIGHT:
-                sendSystemMessageTestingOnly(self, getFirstName(target) + " is a Light Jedi Knight.");
-                break;
+                    sendSystemMessageTestingOnly(self, getFirstName(target) + " is a Light Jedi Knight.");
+                    break;
                 case JEDI_STATE_FORCE_RANKED_DARK:
-                sendSystemMessageTestingOnly(self, getFirstName(target) + " is a Dark Jedi Knight.");
-                break;
+                    sendSystemMessageTestingOnly(self, getFirstName(target) + " is a Dark Jedi Knight.");
+                    break;
                 default:
-                sendSystemMessageTestingOnly(self, getFirstName(target) + " is not a Jedi.");
-                break;
+                    sendSystemMessageTestingOnly(self, getFirstName(target) + " is not a Jedi.");
+                    break;
             }
             sendSystemMessageTestingOnly(self, "(isJedi returns " + isJedi(target) + ")");
             return SCRIPT_CONTINUE;
@@ -3955,17 +3597,10 @@ public class cmd extends script.base_script
             return SCRIPT_CONTINUE;
         }
         sendSystemMessageTestingOnly(self, "format: /gmJediState <command>    /gmJediState ? for help");
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetGroupXPBonus(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isGod(self))
         {
             return SCRIPT_CONTINUE;
@@ -4003,17 +3638,10 @@ public class cmd extends script.base_script
             }
         }
         sendSystemMessageTestingOnly(self, "Test group XP bonus set to " + bonus);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdCreateStaticItem(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (params == null || params.length() < 1)
         {
             sendSystemMessageTestingOnly(self, "format: /CreateStaticItem <NAME> <COUNT>");
@@ -4045,7 +3673,7 @@ public class cmd extends script.base_script
             sendSystemMessageTestingOnly(self, "Error creating static item with supplied NAME (" + itemName + ").");
             CustomerServiceLog("loot", "CSR: (" + getFirstName(self) + ")(" + self + ") tried to create  a static item but the Item Name was bad (" + itemName + ")");
         }
-        else 
+        else
         {
             obj_id inventory = utils.getInventoryContainer(self);
             boolean canAutoStack = false;
@@ -4069,7 +3697,7 @@ public class cmd extends script.base_script
                     staticItemId = static_item.createNewItemFunction(itemName, inventory, tempCount);
                 }
             }
-            else 
+            else
             {
                 staticItemId = static_item.createNewItemFunction(itemName, inventory);
             }
@@ -4080,29 +3708,22 @@ public class cmd extends script.base_script
                     sendSystemMessageTestingOnly(self, "Static Item " + itemName + " (x" + count + ") created in your inventory.");
                     CustomerServiceLog("loot", "CSR: (" + getFirstName(self) + ")(" + self + ") has created (" + itemName + " [x" + count + "])");
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "Static Item " + itemName + " created in your inventory.");
                     CustomerServiceLog("loot", "CSR: (" + getFirstName(self) + ")(" + self + ") has created (" + itemName + ")");
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Error creating static item with supplied NAME (" + itemName + ").");
                 CustomerServiceLog("loot", "CSR: (" + getFirstName(self) + ")(" + self + ") tried to create  a static item but the Item Name was bad (" + itemName + ")");
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdDumpTargetInformation(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         sendSystemMessageTestingOnly(self, "targetis " + params);
         if (!isIdValid(target))
         {
@@ -4141,17 +3762,10 @@ public class cmd extends script.base_script
         {
             sendConsoleMessage(self, strTest);
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdDumpObjectInformation(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         java.util.StringTokenizer st = new java.util.StringTokenizer(params);
         obj_id oid = obj_id.NULL_ID;
         String filename = null;
@@ -4179,52 +3793,31 @@ public class cmd extends script.base_script
                     saveTextOnClient(self, filename, dumpString);
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "/dumpObjectInformation: oid " + oid + " does not exist on this server");
             }
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /dumpObjectInformation <oid> [filename]");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdNpeGotoMedicalBay(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         sendSystemMessageTestingOnly(self, "Sending you to a medical bay instance");
         sendPlayerToTutorial(self);
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdNpeGotoMilleniumFalcon(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         sendSystemMessageTestingOnly(self, "Sending you to a millenium falcon instance");
         npe.movePlayerFromHangarToFalcon(self);
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdNpeGotoTansariiStation(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         java.util.StringTokenizer st = new java.util.StringTokenizer(params);
         int instanceId = 0;
         if (st.hasMoreTokens())
@@ -4232,23 +3825,16 @@ public class cmd extends script.base_script
             instanceId = utils.stringToInt(st.nextToken());
             sendSystemMessageTestingOnly(self, "Sending you to Tansarii station instance number " + instanceId);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "Sending you to Tansarii station instance number 0. Pass in the index to a specific instance if you are looking for a specific one.");
         }
         utils.setScriptVar(self, npe.SCRIPT_VAR_INSTANCE_OVERRIDE, instanceId);
         npe.movePlayerFromFalconToSharedStation(self);
-	   }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdNpeGotoStationGamma(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         java.util.StringTokenizer st = new java.util.StringTokenizer(params);
         int instanceId = 0;
         if (st.hasMoreTokens())
@@ -4256,36 +3842,22 @@ public class cmd extends script.base_script
             instanceId = utils.stringToInt(st.nextToken());
             sendSystemMessageTestingOnly(self, "Sending you to station Gamma instance number " + instanceId);
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "Sending you to station Gamma instance number 0. Pass in the index to a specific instance if you are looking for a specific one.");
         }
         utils.setScriptVar(self, npe.SCRIPT_VAR_INSTANCE_OVERRIDE, instanceId);
         npe.movePlayerFromOrdMantellSpaceToOrdMantellDungeon(self);
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdStartRestussStageTwo(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         attachScript(self, "systems.cw_data.cluster_wide_response_manager");
         getClusterWideData("event", "restuss_event", true, self);
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdCompleteRestussStageOne(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         obj_id[] objects = getAllObjectsWithObjVar(getLocation(self), 200.0f, "element");
         if (objects == null || objects.length == 0)
         {
@@ -4339,17 +3911,10 @@ public class cmd extends script.base_script
                 continue;
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGmShowQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         StringTokenizer st = new java.util.StringTokenizer(params);
         String playerOid = "";
         String logFile = "";
@@ -4389,26 +3954,19 @@ public class cmd extends script.base_script
                     }
                 }
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Please check the OID and try again");
             }
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /gmshowquest <player OID>");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGmClearQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         StringTokenizer st = new java.util.StringTokenizer(params);
         String playerOid = "";
         String questVar = "";
@@ -4428,26 +3986,19 @@ public class cmd extends script.base_script
                 gm.forceClearQuest(targetOid, questVar);
                 CustomerServiceLog("gmQuest", "CSR: (" + self + ") " + getName(self) + " has cleared (or attempted to clear) quest (" + questVar + ") from (" + targetOid + ") " + utils.getStringName(targetOid));
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Please check the OID and try again");
             }
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /gmclearquest <player OID> <quest/code_string>");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdGmRegrantQuest(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         StringTokenizer st = new java.util.StringTokenizer(params);
         String playerOid = "";
         String questVar = "";
@@ -4467,26 +4018,19 @@ public class cmd extends script.base_script
                 gm.forceRegrantQuest(targetOid, questVar);
                 CustomerServiceLog("gmQuest", "CSR: (" + self + ") " + getName(self) + " has cleared and granted (or attempted to clear and grant) quest (" + questVar + ") from (" + targetOid + ") " + utils.getStringName(targetOid));
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "Please check the OID and try again");
             }
         }
-        else 
+        else
         {
             sendSystemMessageTestingOnly(self, "[Syntax] /gmregrantquest <player OID> <quest/code_string>");
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdSetInstanceAuthorized(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isGod(self))
         {
             return SCRIPT_CONTINUE;
@@ -4499,17 +4043,10 @@ public class cmd extends script.base_script
         }
         utils.setScriptVar(self, gm.INSTANCE_AUTH, 1);
         sendSystemMessageTestingOnly(self, "You are now overriding private instance authorization checks");
-       }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdCombatDataRecord(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isGod(self))
         {
             return SCRIPT_CONTINUE;
@@ -4519,7 +4056,7 @@ public class cmd extends script.base_script
         {
             message += "Already recording combat data.";
         }
-        else 
+        else
         {
             utils.setScriptVar(self, "testing_recordCombatData", true);
             message += "Now recording yourcombat data. \n";
@@ -4528,17 +4065,10 @@ public class cmd extends script.base_script
             message += "Use /combatDataStop to stop recording combat data.";
         }
         sendSystemMessage(self, message, "");
-	   }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdCombatDataClear(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isGod(self))
         {
             return SCRIPT_CONTINUE;
@@ -4549,37 +4079,23 @@ public class cmd extends script.base_script
             sendSystemMessage(self, new string_id("target_dummy", "combat_data_all_clearing"));
             sendSystemMessage(self, new string_id("target_dummy", "combat_data_all_cleared"));
         }
-        else 
+        else
         {
             sendSystemMessage(self, new string_id("target_dummy", "placement_no_combat_data"));
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public int cmdCombatDataReport(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isGod(self))
         {
             return SCRIPT_CONTINUE;
         }
         target_dummy.reportCombatData(self, self);
-	   }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdCombatDataStop(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         if (!isGod(self))
         {
             return SCRIPT_CONTINUE;
@@ -4589,21 +4105,14 @@ public class cmd extends script.base_script
             utils.removeScriptVar(self, "testing_recordCombatData");
             sendSystemMessage(self, "No longer recording combat data.", "");
         }
-        else 
+        else
         {
             sendSystemMessage(self, "Not currently recording combat data.", "");
         }
-	   }
-		return SCRIPT_CONTINUE;
+        return SCRIPT_CONTINUE;
     }
     public int cmdCsDumpTarget(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-	   if (getGodLevel(self) < 40)
-       {
-            sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
-       }
-       else 
-       {
         StringTokenizer st = new java.util.StringTokenizer(params);
         String strObjectOid = "";
         if (st.hasMoreTokens())
@@ -4617,12 +4126,12 @@ public class cmd extends script.base_script
             {
                 sendSystemMessageTestingOnly(self, "The OID you specified is invalid.");
             }
-            else 
+            else
             {
                 createDumpFile(self, objectOid);
             }
         }
-        else 
+        else
         {
             obj_id lookAtTarget = dump.findDumpTarget(self);
             if (!isIdValid(lookAtTarget))
@@ -4633,12 +4142,11 @@ public class cmd extends script.base_script
             {
                 createDumpFile(self, lookAtTarget);
             }
-            else 
+            else
             {
                 sendSystemMessageTestingOnly(self, "you must have a valid target to use this command.");
             }
         }
-	   }
         return SCRIPT_CONTINUE;
     }
     public void createDumpFile(obj_id self, obj_id targetObject) throws InterruptedException
@@ -4666,11 +4174,11 @@ public class cmd extends script.base_script
     }
     public int cmdSetGalaxyMessage(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-        if (getGodLevel(self) < 40)
+        if (getGodLevel(self) < 10)
         {
             sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
         }
-        else 
+        else
         {
             String commandParams = params;
             if (commandParams != null && !commandParams.equals(""))
@@ -4691,7 +4199,7 @@ public class cmd extends script.base_script
                         sendConsoleMessage(self, strMessage);
                         CustomerServiceLog("setGalaxyMessage", "CSR: (" + self + ") " + getName(self) + " has retrieved the object ID for the Galaxy-wide message.");
                     }
-                    else 
+                    else
                     {
                         if (commandParams.indexOf("set") == 0 && commandParams.length() > 4)
                         {
@@ -4704,12 +4212,12 @@ public class cmd extends script.base_script
                         }
                     }
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "The tool failed to find the proper planet object. Notify the tool team.");
                 }
             }
-            else 
+            else
             {
                 sendConsoleMessage(self, "To set the Galaxy-wide message use the /setLoginMessage command followed by one of the followind commands:");
                 sendConsoleMessage(self, "\t1. set <your string here> - sets the login message to a string you specify.");
@@ -4722,11 +4230,11 @@ public class cmd extends script.base_script
     }
     public int cmdSetWardenGalaxyMessage(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
-        if (getGodLevel(self) < 40)
+        if (getGodLevel(self) < 10)
         {
             sendSystemMessage(self, "You do not have the appropriate access level to use this command.", null);
         }
-        else 
+        else
         {
             String commandParams = params;
             if (commandParams != null && !commandParams.equals(""))
@@ -4747,7 +4255,7 @@ public class cmd extends script.base_script
                         sendConsoleMessage(self, strMessage);
                         CustomerServiceLog("setGalaxyMessage", "CSR: (" + self + ") " + getName(self) + " has retrieved the object ID for the warden Galaxy-wide message.");
                     }
-                    else 
+                    else
                     {
                         if (commandParams.indexOf("set") == 0 && commandParams.length() > 4)
                         {
@@ -4760,12 +4268,12 @@ public class cmd extends script.base_script
                         }
                     }
                 }
-                else 
+                else
                 {
                     sendSystemMessageTestingOnly(self, "The tool failed to find the proper planet object. Notify the tool team.");
                 }
             }
-            else 
+            else
             {
                 sendConsoleMessage(self, "To set the warden Galaxy-wide message use the /setWardenLoginMessage command followed by one of the followind commands:");
                 sendConsoleMessage(self, "\t1. set <your string here> - sets the warden login message to a string you specify.");