diff --git a/src/backend/InvenTree/InvenTree/status.py b/src/backend/InvenTree/InvenTree/status.py
index a17cc3463e..c2fd3943b7 100644
--- a/src/backend/InvenTree/InvenTree/status.py
+++ b/src/backend/InvenTree/InvenTree/status.py
@@ -19,7 +19,6 @@ def is_worker_running(**kwargs):
     clusters = Stat.get_all()
 
     if len(clusters) > 0:
-        # TODO - Introspect on any cluster information
         return True
 
     """
diff --git a/src/backend/InvenTree/machine/tests.py b/src/backend/InvenTree/machine/tests.py
index 16e6bee638..94b7491df5 100755
--- a/src/backend/InvenTree/machine/tests.py
+++ b/src/backend/InvenTree/machine/tests.py
@@ -275,11 +275,6 @@ class TestLabelPrinterMachineType(TestMachineRegistryMixin, InvenTreeAPITestCase
         self.assertEqual(self.print_labels.call_args.args[0], self.machine.machine)
         self.assertEqual(self.print_labels.call_args.args[1], template)
 
-        # TODO re-activate test
-        # self.assertQuerySetEqual(
-        #    self.print_labels.call_args.args[2], parts, transform=lambda x: x
-        # )
-
         self.assertIn('printing_options', self.print_labels.call_args.kwargs)
         self.assertEqual(
             self.print_labels.call_args.kwargs['printing_options'],
diff --git a/src/backend/InvenTree/stock/models.py b/src/backend/InvenTree/stock/models.py
index 4c35e2a539..ce8ed2025b 100644
--- a/src/backend/InvenTree/stock/models.py
+++ b/src/backend/InvenTree/stock/models.py
@@ -1278,13 +1278,7 @@ class StockItem(
 
     def is_allocated(self):
         """Return True if this StockItem is allocated to a SalesOrder or a Build."""
-        # TODO - For now this only checks if the StockItem is allocated to a SalesOrder
-        # TODO - In future, once the "build" is working better, check this too
-
-        if self.allocations.count() > 0:
-            return True
-
-        return self.sales_order_allocations.count() > 0
+        return self.allocation_count() > 0
 
     def build_allocation_count(self, **kwargs):
         """Return the total quantity allocated to builds, with optional filters."""
@@ -1469,8 +1463,6 @@ class StockItem(
         if self.belongs_to is None:
             return False
 
-        # TODO - Are there any other checks that need to be performed at this stage?
-
         # Add a transaction note to the parent item
         self.belongs_to.add_tracking_entry(
             StockHistoryCode.REMOVED_CHILD_ITEM,
@@ -2403,9 +2395,6 @@ class StockItem(
         """Remove all test results."""
         # All test results
         results = self.test_results.all()
-
-        # TODO - Perhaps some filtering options supplied by kwargs?
-
         results.delete()
 
     def getTestResults(self, template=None, test=None, result=None, user=None):
diff --git a/src/backend/InvenTree/users/admin.py b/src/backend/InvenTree/users/admin.py
index 3331cf39f7..05837a2bba 100644
--- a/src/backend/InvenTree/users/admin.py
+++ b/src/backend/InvenTree/users/admin.py
@@ -68,7 +68,6 @@ class RuleSetInline(admin.TabularInline):
     max_num = len(RuleSet.RULESET_CHOICES)
     min_num = 1
     extra = 0
-    # TODO: find better way to order inlines
     ordering = ['name']
 
 
diff --git a/src/backend/InvenTree/users/models.py b/src/backend/InvenTree/users/models.py
index ea9d453fda..804c7ca3b8 100644
--- a/src/backend/InvenTree/users/models.py
+++ b/src/backend/InvenTree/users/models.py
@@ -51,8 +51,6 @@ def default_token():
 
 def default_token_expiry():
     """Generate an expiry date for a newly created token."""
-    # TODO: Custom value for default expiry timeout
-    # TODO: For now, tokens last for 1 year
     return InvenTree.helpers.current_date() + datetime.timedelta(days=365)