diff --git a/src/calibre/srv/metadata.py b/src/calibre/srv/metadata.py
index c94b0cd265..bbc3260106 100644
--- a/src/calibre/srv/metadata.py
+++ b/src/calibre/srv/metadata.py
@@ -167,7 +167,6 @@ def get_gpref(name: str, defval = None):
 
 
 def get_icon_for_node(node, parent, node_to_tag_map, tag_map, eval_formatter, db):
-    # This needs a legacy database so legacy formatter functions work
     category = node['category']
     if category in ('search', 'formats') or category.startswith('@'):
         return
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index 1b0c6033e9..11ebdee377 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -249,11 +249,8 @@ class FormatterFunction:
         only_in_gui_error(self.name)
 
     def get_database(self, mi, formatter=None):
-        if formatter is not None:
-            if hasattr(formatter, 'database'):
-                db = formatter.database
-                if db is not None:
-                    return db
+        if (db := getattr(formatter, 'database', None)) is not None:
+            return db
         return get_database(mi, self.name)