diff --git a/web/ui/mantine-ui/src/pages/query/ExpressionInput.tsx b/web/ui/mantine-ui/src/pages/query/ExpressionInput.tsx
index d7dbf0dd6..dce05c181 100644
--- a/web/ui/mantine-ui/src/pages/query/ExpressionInput.tsx
+++ b/web/ui/mantine-ui/src/pages/query/ExpressionInput.tsx
@@ -206,7 +206,7 @@ const ExpressionInput: FC<ExpressionInputProps> = ({
     enableLinter,
     enableQueryHistory,
     queryHistory,
-  ]); // TODO: Make this depend on external settings changes, maybe use dynamic config compartment again.
+  ]); // TODO: Maybe use dynamic config compartment again as in the old UI?
 
   return (
     <Group align="flex-start" wrap="nowrap" gap="xs">
diff --git a/web/ui/mantine-ui/src/pages/query/QueryPanel.tsx b/web/ui/mantine-ui/src/pages/query/QueryPanel.tsx
index a17231182..24eb8c59c 100644
--- a/web/ui/mantine-ui/src/pages/query/QueryPanel.tsx
+++ b/web/ui/mantine-ui/src/pages/query/QueryPanel.tsx
@@ -123,7 +123,6 @@ const QueryPanel: FC<PanelProps> = ({ idx, metricNames }) => {
           >
             <TreeView
               panelIdx={idx}
-              retriggerIdx={retriggerIdx}
               selectedNode={selectedNode}
               setSelectedNode={setSelectedNode}
               closeTreeView={() => {
diff --git a/web/ui/mantine-ui/src/pages/query/TreeView.tsx b/web/ui/mantine-ui/src/pages/query/TreeView.tsx
index 1455e4377..3a631f1e3 100644
--- a/web/ui/mantine-ui/src/pages/query/TreeView.tsx
+++ b/web/ui/mantine-ui/src/pages/query/TreeView.tsx
@@ -7,8 +7,6 @@ import { Card, CloseButton } from "@mantine/core";
 
 const TreeView: FC<{
   panelIdx: number;
-  // TODO: Do we need retriggerIdx for the tree view AST parsing? Maybe for children!
-  retriggerIdx: number;
   selectedNode: {
     id: string;
     node: ASTNode;
diff --git a/web/ui/mantine-ui/src/pages/targets/ScrapePoolsList.tsx b/web/ui/mantine-ui/src/pages/targets/ScrapePoolsList.tsx
index 290543fc5..8790f4522 100644
--- a/web/ui/mantine-ui/src/pages/targets/ScrapePoolsList.tsx
+++ b/web/ui/mantine-ui/src/pages/targets/ScrapePoolsList.tsx
@@ -326,7 +326,6 @@ const ScrapePoolList: FC<ScrapePoolListProp> = ({
                                 }}
                               >
                                 <Table.Td valign="top">
-                                  {/* TODO: Process target URL like in old UI */}
                                   <EndpointLink
                                     endpoint={target.scrapeUrl}
                                     globalUrl={target.globalUrl}