diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index 237166a43b9..d201faaf38b 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -1437,10 +1437,6 @@ $table{dependencies} =
 # without enabling them to extend the life of the group by adding bugs to it.
 # http://bugzilla.mozilla.org/show_bug.cgi?id=75482
 
-# group type
-#    0 - system groups
-#    1 - bug groups
-#    2 - normal groups
 $table{groups} =
    'group_id mediumint not null auto_increment primary key,
     name varchar(255) not null,
@@ -1580,18 +1576,13 @@ $table{tokens} =
 
 # group membership tables for tracking group and privilege 
 # 
-# This table determines the groups that a user beloings to
+# This table determines the groups that a user belongs to
 # directly or due to regexp and which groups can be blessed
-# by a user or group
+# by a user 
 # maptype:
-# val  nick     meaning
-# 0 - "u2gm"    member_id is the user_id of a group member
-# 1 - "uBg"     member_id is the user_id of a user who can bless the group
-# 2 - "g2gm"    member_id is the group_id of a group included in the group
-# 3 - "gBg"     member_id is the group_id of a group who can bless the group
-# isderived: (applies to u2gm records only)
-# if 0 - u2gm record was explicitly granted
-# if 1 - u2gm record was created by evaluating a regexp or group hierarchy
+# isderived: 
+# if 0 - record was explicitly granted
+# if 1 - record was created by evaluating a regexp or group hierarchy
 $table{user_group_map} =
     'user_id mediumint not null,
      group_id mediumint not null,
diff --git a/mozilla/webtools/bugzilla/editgroups.cgi b/mozilla/webtools/bugzilla/editgroups.cgi
index cd2c4b299c6..dbd56a7b07f 100755
--- a/mozilla/webtools/bugzilla/editgroups.cgi
+++ b/mozilla/webtools/bugzilla/editgroups.cgi
@@ -29,11 +29,6 @@ use lib ".";
 
 require "CGI.pl";
 
-sub sillyness {
-    my $zz;
-}
-
-
 ConnectToDatabase();
 confirm_login();
 
@@ -124,24 +119,24 @@ unless ($action) {
         my ($groupid, $name, $desc, $regexp, $isactive, $isbuggroup) = FetchSQLData();
         print "<tr>\n";
         if ($isbuggroup == 0 ) {
-        print "<td>$name</td>\n";
-        print "<td>$desc</td>\n";
-        print "<td><input size=30 name=\"regexp-$groupid\" value=\"$regexp\">\n";
-        print "<input type=hidden name=\"oldregexp-$groupid\" value=\"$regexp\"></td>\n";
-        print "<td>&nbsp</td>";
-        print "<td>";
+            print "<td>$name</td>\n";
+            print "<td>$desc</td>\n";
+            print "<td><input size=30 name=\"regexp-$groupid\" value=\"$regexp\">\n";
+            print "<input type=hidden name=\"oldregexp-$groupid\" value=\"$regexp\"></td>\n";
+            print "<td>&nbsp</td>";
+            print "<td>";
             print "system";
         } else {
-        print "<td><input size=20 name=\"name-$groupid\" value=\"$name\">\n";
-        print "<input type=hidden name=\"oldname-$groupid\" value=\"$name\"></td>\n";
-        print "<td><input size=40 name=\"desc-$groupid\" value=\"$desc\">\n";
-        print "<input type=hidden name=\"olddesc-$groupid\" value=\"$desc\"></td>\n";
-        print "<td><input size=30 name=\"regexp-$groupid\" value=\"$regexp\">\n";
-        print "<input type=hidden name=\"oldregexp-$groupid\" value=\"$regexp\"></td>\n";
-        print "<td><input type=\"checkbox\" name=\"isactive-$groupid\" value=\"1\"" . ($isactive ? " checked" : "") . ">\n";
-        print "<input type=hidden name=\"oldisactive-$groupid\" value=\"$isactive\"></td>\n";
-        print "<td>user</td>\n";
-    }
+            print "<td><input size=20 name=\"name-$groupid\" value=\"$name\">\n";
+            print "<input type=hidden name=\"oldname-$groupid\" value=\"$name\"></td>\n";
+            print "<td><input size=40 name=\"desc-$groupid\" value=\"$desc\">\n";
+            print "<input type=hidden name=\"olddesc-$groupid\" value=\"$desc\"></td>\n";
+            print "<td><input size=30 name=\"regexp-$groupid\" value=\"$regexp\">\n";
+            print "<input type=hidden name=\"oldregexp-$groupid\" value=\"$regexp\"></td>\n";
+            print "<td><input type=\"checkbox\" name=\"isactive-$groupid\" value=\"1\"" . ($isactive ? " checked" : "") . ">\n";
+            print "<input type=hidden name=\"oldisactive-$groupid\" value=\"$isactive\"></td>\n";
+            print "<td>user</td>\n";
+        }
         print "<td align=center valign=middle>
                <a href=\"editgroups.cgi?action=changeform&group=$groupid\">Edit</a>";
         print " | <a href=\"editgroups.cgi?action=del&group=$groupid\">Delete</a>" if ($isbuggroup != 0);