diff --git a/apps/studio/.github/eslint-rule-baselines.json b/apps/studio/.github/eslint-rule-baselines.json
index af9d8956796..127d2167d25 100644
--- a/apps/studio/.github/eslint-rule-baselines.json
+++ b/apps/studio/.github/eslint-rule-baselines.json
@@ -1,11 +1,11 @@
 {
   "rules": {
-    "react-hooks/exhaustive-deps": 179,
+    "react-hooks/exhaustive-deps": 175,
     "import/no-anonymous-default-export": 57,
     "@tanstack/query/exhaustive-deps": 12,
-    "@typescript-eslint/no-explicit-any": 1042,
+    "@typescript-eslint/no-explicit-any": 1014,
     "no-restricted-imports": 0,
-    "no-restricted-exports": 255,
+    "no-restricted-exports": 252,
     "react/no-unstable-nested-components": 51,
     "studio/require-safe-sql-fragment": 158
   },
@@ -25,7 +25,6 @@
       "components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsx": 1,
       "components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx": 1,
       "components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsx": 2,
-      "components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx": 1,
       "components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx": 1,
       "components/interfaces/Auth/RedirectUrls/AddNewURLModal.tsx": 1,
       "components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx": 1,
@@ -53,7 +52,6 @@
       "components/interfaces/Organization/BillingSettings/BillingEmail.tsx": 1,
       "components/interfaces/Organization/BillingSettings/CreditTopUp.tsx": 1,
       "components/interfaces/Organization/BillingSettings/Subscription/PaymentMethodSelection.tsx": 2,
-      "components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx": 1,
       "components/interfaces/Organization/Usage/Compute.tsx": 1,
       "components/interfaces/ProjectAPIDocs/Content/Entity.tsx": 1,
       "components/interfaces/ProjectAPIDocs/Content/RPC.tsx": 1,
@@ -88,7 +86,6 @@
       "components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx": 2,
       "components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx": 1,
       "components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx": 2,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/ServiceFlowHeader.tsx": 2,
       "components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout.tsx": 1,
       "components/layouts/ProjectLayout/ConnectingState.tsx": 1,
       "components/layouts/ProjectLayout/PausedState/PauseDisabledState.tsx": 1,
@@ -229,7 +226,6 @@
       "components/grid/types/base.ts": 2,
       "components/grid/types/table.ts": 1,
       "components/grid/utils/column.ts": 2,
-      "components/grid/utils/common.ts": 1,
       "components/grid/utils/gridColumns.tsx": 10,
       "components/interfaces/Account/AccessTokens/Scoped/Form/ResourceAccess/ResourceAccess.types.ts": 2,
       "components/interfaces/App/UpdateBillingAddressModal.tsx": 2,
@@ -317,7 +313,7 @@
       "components/interfaces/JwtSecrets/jwt-secret-keys-table/create-key-dialog.tsx": 2,
       "components/interfaces/JwtSecrets/jwt-settings.tsx": 1,
       "components/interfaces/Linter/LinterDataGrid.tsx": 4,
-      "components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx": 2,
+      "components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx": 3,
       "components/interfaces/Observability/ObservabilityOverview.tsx": 1,
       "components/interfaces/Observability/ServiceHealthCard.tsx": 1,
       "components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx": 3,
@@ -326,8 +322,6 @@
       "components/interfaces/Organization/BillingSettings/CreditTopUp.tsx": 2,
       "components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx": 1,
       "components/interfaces/Organization/BillingSettings/Subscription/PaymentMethodSelection.tsx": 1,
-      "components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx": 1,
-      "components/interfaces/Organization/BillingSettings/Subscription/SubscriptionPlanUpdateDialog.tsx": 6,
       "components/interfaces/Organization/BillingSettings/Subscription/UpgradeModal.tsx": 3,
       "components/interfaces/Organization/IntegrationSettings/SidePanelVercelProjectLinker.tsx": 1,
       "components/interfaces/Organization/InvoicesSettings/InvoicesSettings.tsx": 2,
@@ -346,14 +340,12 @@
       "components/interfaces/ProjectAPIDocs/ResourceContent.tsx": 1,
       "components/interfaces/ProjectCreation/PostgresVersionSelector.tsx": 2,
       "components/interfaces/QueryInsights/QueryInsights.types.ts": 1,
-      "components/interfaces/QueryInsights/utils/supamonitor.utils.ts": 1,
       "components/interfaces/QueryPerformance/IndexAdvisor/EnableIndexAdvisorButton.tsx": 1,
       "components/interfaces/QueryPerformance/IndexAdvisor/IndexAdvisorDisabledState.tsx": 1,
       "components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils.ts": 2,
       "components/interfaces/QueryPerformance/QueryPerformanceChart.tsx": 3,
       "components/interfaces/QueryPerformance/QueryPerformanceGrid.tsx": 3,
       "components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx": 1,
-      "components/interfaces/QueryPerformance/WithStatements/WithStatements.utils.ts": 1,
       "components/interfaces/Realtime/Inspector/Messages.types.ts": 1,
       "components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx": 1,
       "components/interfaces/Realtime/Inspector/useRealtimeMessages.ts": 10,
@@ -378,7 +370,7 @@
       "components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx": 1,
       "components/interfaces/SQLEditor/UtilityPanel/CellDetailPanel.tsx": 1,
       "components/interfaces/SQLEditor/UtilityPanel/ChartConfig.tsx": 2,
-      "components/interfaces/SQLEditor/UtilityPanel/Results.tsx": 7,
+      "components/interfaces/SQLEditor/UtilityPanel/Results.tsx": 6,
       "components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx": 1,
       "components/interfaces/SQLEditor/hooks.ts": 1,
       "components/interfaces/SQLEditor/useAddDefinitions.ts": 1,
@@ -451,21 +443,14 @@
       "components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ForeignKeysManagement/ForeignKeyRow.tsx": 1,
       "components/interfaces/TableGridEditor/TableDefinition.tsx": 3,
       "components/interfaces/TableGridEditor/TableEntity.utils.ts": 1,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/ServiceFlowHeader.tsx": 1,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/ResponseCompletedBlock.tsx": 2,
-      "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/Block.tsx": 1,
+      "components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/PostgresFlowDetail.tsx": 2,
+      "components/interfaces/UnifiedLogs/ServiceFlow/components/blocks/ResponseCompletedBlock.tsx": 1,
       "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/CollapsibleSection.tsx": 4,
       "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldWithSeeMore.tsx": 4,
       "components/interfaces/UnifiedLogs/ServiceFlow/components/shared/TimelineStep.tsx": 1,
       "components/interfaces/UnifiedLogs/ServiceFlow/config/fieldHelpers.ts": 3,
       "components/interfaces/UnifiedLogs/ServiceFlow/types.ts": 10,
       "components/interfaces/UnifiedLogs/ServiceFlow/utils/storageUtils.ts": 3,
-      "components/interfaces/UnifiedLogs/UnifiedLogs.queries.ts": 4,
-      "components/interfaces/UnifiedLogs/UnifiedLogs.tsx": 8,
-      "components/interfaces/UnifiedLogs/UnifiedLogs.utils.ts": 1,
-      "components/interfaces/UnifiedLogs/components/DownloadLogsButton.tsx": 1,
-      "components/interfaces/UnifiedLogs/components/LogsListPanel.tsx": 1,
-      "components/layouts/AccountLayout/WithSidebar.tsx": 2,
       "components/layouts/DocsLayout/DocsLayout.tsx": 2,
       "components/layouts/IntegrationsLayout/Integrations.utils.ts": 2,
       "components/layouts/Navigation/LayoutHeader/BreadcrumbsView.tsx": 2,
@@ -799,7 +784,6 @@
       "components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx": 1,
       "components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropAllReplicasConfirmationModal.tsx": 1,
       "components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx": 1,
-      "components/interfaces/Settings/Integrations/IntegrationsSettings.tsx": 1,
       "components/interfaces/Settings/Integrations/VercelIntegration/VercelIntegrationConnectionForm.tsx": 1,
       "components/interfaces/Settings/Logs/LogColumnRenderers/AuthColumnRenderer.tsx": 1,
       "components/interfaces/Settings/Logs/LogColumnRenderers/DatabaseApiColumnRender.tsx": 1,
@@ -859,7 +843,6 @@
       "components/layouts/OrganizationLayout.tsx": 1,
       "components/layouts/ProjectLayout/BuildingState.tsx": 1,
       "components/layouts/ProjectLayout/ConnectingState.tsx": 1,
-      "components/layouts/ProjectLayout/OrganizationSettingsLayout.tsx": 1,
       "components/layouts/ProjectLayout/RestartingState.tsx": 1,
       "components/layouts/ProjectSettingsLayout/SettingsLayout.tsx": 1,
       "components/layouts/RealtimeLayout/RealtimeLayout.tsx": 1,
@@ -876,7 +859,6 @@
       "components/to-be-cleaned/KeyMap.tsx": 1,
       "components/to-be-cleaned/ProductEmptyState.tsx": 1,
       "components/to-be-cleaned/Table.tsx": 1,
-      "components/to-be-cleaned/forms/AutoTextArea.tsx": 1,
       "components/ui/AIEditor/ResizableAIWidget.tsx": 1,
       "components/ui/AlertError.tsx": 1,
       "components/ui/CardButton.tsx": 1,