diff --git a/build/templates/__init__.py.mako b/build/templates/__init__.py.mako
index e6fc5f4fa0..3cb4473dcf 100644
--- a/build/templates/__init__.py.mako
+++ b/build/templates/__init__.py.mako
@@ -107,22 +107,16 @@ def get_diagnostic_information():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    ## TODO (ni-jfitzger): Delete use of pkg_resources when we drop Python 3.9 support. See https://github.com/ni/nimi-python/issues/2047
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nidcpower/nidcpower/__init__.py b/generated/nidcpower/nidcpower/__init__.py
index 4d1314902b..3cd181349f 100644
--- a/generated/nidcpower/nidcpower/__init__.py
+++ b/generated/nidcpower/nidcpower/__init__.py
@@ -64,21 +64,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nidigital/nidigital/__init__.py b/generated/nidigital/nidigital/__init__.py
index f389587d3d..760ce4f5c4 100644
--- a/generated/nidigital/nidigital/__init__.py
+++ b/generated/nidigital/nidigital/__init__.py
@@ -58,21 +58,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nidmm/nidmm/__init__.py b/generated/nidmm/nidmm/__init__.py
index 771af0160b..764cad5c79 100644
--- a/generated/nidmm/nidmm/__init__.py
+++ b/generated/nidmm/nidmm/__init__.py
@@ -56,21 +56,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nifake/nifake/__init__.py b/generated/nifake/nifake/__init__.py
index ffb333f181..e67195e4f2 100644
--- a/generated/nifake/nifake/__init__.py
+++ b/generated/nifake/nifake/__init__.py
@@ -68,21 +68,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nifgen/nifgen/__init__.py b/generated/nifgen/nifgen/__init__.py
index a8202c2dd8..1b089a037a 100644
--- a/generated/nifgen/nifgen/__init__.py
+++ b/generated/nifgen/nifgen/__init__.py
@@ -56,21 +56,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nimodinst/nimodinst/__init__.py b/generated/nimodinst/nimodinst/__init__.py
index 37a2dd9a36..834ac12299 100644
--- a/generated/nimodinst/nimodinst/__init__.py
+++ b/generated/nimodinst/nimodinst/__init__.py
@@ -54,21 +54,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nirfsg/nirfsg/__init__.py b/generated/nirfsg/nirfsg/__init__.py
index 4d8d355c09..9ad6710c16 100644
--- a/generated/nirfsg/nirfsg/__init__.py
+++ b/generated/nirfsg/nirfsg/__init__.py
@@ -55,21 +55,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/niscope/niscope/__init__.py b/generated/niscope/niscope/__init__.py
index a8d64956f5..7d80224e53 100644
--- a/generated/niscope/niscope/__init__.py
+++ b/generated/niscope/niscope/__init__.py
@@ -62,21 +62,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nise/nise/__init__.py b/generated/nise/nise/__init__.py
index f16702cb21..c33bde766d 100644
--- a/generated/nise/nise/__init__.py
+++ b/generated/nise/nise/__init__.py
@@ -55,21 +55,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/niswitch/niswitch/__init__.py b/generated/niswitch/niswitch/__init__.py
index 93fda6d87c..316d5acd20 100644
--- a/generated/niswitch/niswitch/__init__.py
+++ b/generated/niswitch/niswitch/__init__.py
@@ -56,21 +56,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()
diff --git a/generated/nitclk/nitclk/__init__.py b/generated/nitclk/nitclk/__init__.py
index f5f6b751d7..6d52a31cc7 100644
--- a/generated/nitclk/nitclk/__init__.py
+++ b/generated/nitclk/nitclk/__init__.py
@@ -64,21 +64,16 @@ def is_venv():
     else:
         raise SystemError('Unsupported platform: {}'.format(platform.system()))
 
-    if sys.version_info[1] >= 10:
-        installed_packages_names = [
-            name
-            for name_list in importlib.metadata.packages_distributions().values()
-            for name in name_list
-        ]
-        installed_packages_names = set(installed_packages_names)
-        installed_packages_list = [
-            {'name': name, 'version': importlib.metadata.distribution(name).version}
-            for name in sorted(installed_packages_names)
-        ]
-    else:
-        import pkg_resources
-        installed_packages = pkg_resources.working_set
-        installed_packages_list = [{'name': i.key, 'version': i.version, } for i in installed_packages]
+    installed_packages_names = [
+        name
+        for name_list in importlib.metadata.packages_distributions().values()
+        for name in name_list
+    ]
+    installed_packages_names = set(installed_packages_names)
+    installed_packages_list = [
+        {'name': name, 'version': importlib.metadata.distribution(name).version}
+        for name in sorted(installed_packages_names)
+    ]
 
     info['os']['name'] = os_name
     info['os']['version'] = platform.version()