2 files changed, 1 insertions, 10 deletions
diff --git a/extensions/TrackingFlags/Extension.pm b/extensions/TrackingFlags/Extension.pm
index 9b3d46ad2..301c10245 100644
--- a/extensions/TrackingFlags/Extension.pm
+++ b/extensions/TrackingFlags/Extension.pm
@@ -32,10 +32,7 @@ BEGIN {
 }
 
 sub _tracking_flag_names {
-    # return just a list of names, hitting the database directly to avoid the
-    # overhead of object creation
-    return Bugzilla->request_cache->{tracking_flag_names} ||=
-        Bugzilla->dbh->selectcol_arrayref("SELECT name FROM tracking_flags");
+    return Bugzilla::Extension::TrackingFlags::Flag->get_all_names();
 }
 
 sub page_before_template {
diff --git a/extensions/TrackingFlags/lib/Constants.pm b/extensions/TrackingFlags/lib/Constants.pm
index b6813c3c2..0b1ae3a1a 100644
--- a/extensions/TrackingFlags/lib/Constants.pm
+++ b/extensions/TrackingFlags/lib/Constants.pm
@@ -34,12 +34,6 @@ sub FLAG_TYPES {
             collapsed   => 1,
             sortkey     => 2
         },
-        {
-            name        => 'b2g',
-            description => 'B2G Flags',
-            collapsed   => 1,
-            sortkey     => 3
-        },
     );
     return [ sort { $a->{'sortkey'} <=> $b->{'sortkey'} } @flag_types ];
 }