diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 4f4eb6c9d1..42ea30dbb0 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -2,7 +2,7 @@
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
   import { BUDIBASE_INTERNAL_DB } from "constants"
-  import { database, datasources, queries, tables } from "stores/backend"
+  import { database, datasources, queries } from "stores/backend"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
@@ -19,11 +19,6 @@
     $goto(`./datasource/${query.datasourceId}/${query._id}`)
   }
 
-  function onClickTable(table) {
-    tables.select(table)
-    $goto(`./table/${table._id}`)
-  }
-
   onMount(() => {
     datasources.fetch()
     queries.fetch()
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte
index 4a9bd66367..7e11a4c3ff 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/index.svelte
@@ -6,7 +6,6 @@
 
   export let integration = {}
 
-  let schema
   let integrations = []
 
   async function fetchIntegrations() {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
index ca573d083b..180d03f7ff 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources, tables } from "stores/backend"
+  import { datasources } from "stores/backend"
   import { notifications } from "@budibase/bbui"
   import { Input, Label, ModalContent } from "@budibase/bbui"
   import TableIntegrationMenu from "../TableIntegrationMenu/index.svelte"
diff --git a/packages/builder/src/components/deploy/DeployModal.svelte b/packages/builder/src/components/deploy/DeployModal.svelte
index d39effa7a7..6e1b5f76e9 100644
--- a/packages/builder/src/components/deploy/DeployModal.svelte
+++ b/packages/builder/src/components/deploy/DeployModal.svelte
@@ -1,6 +1,7 @@
 <script>
   import { onMount, onDestroy } from "svelte"
   import { Button, Modal, notifications, ModalContent } from "@budibase/bbui"
+  import FeedbackIframe from "../feedback/FeedbackIframe.svelte"
   import { store } from "builderStore"
   import api from "builderStore/api"
   import analytics from "analytics"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 9ba474eacb..6ce765d424 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -1,11 +1,9 @@
 <script>
-  import { isActive, goto, params } from "@roxi/routify"
+  import { goto, params } from "@roxi/routify"
   import { Icon, Modal, Tabs, Tab } from "@budibase/bbui"
   import { BUDIBASE_INTERNAL_DB } from "constants"
-  import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
   import CreateDatasourceModal from "components/backend/DatasourceNavigator/modals/CreateDatasourceModal.svelte"
-  import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
 
   let selected = "Sources"
   let modal
@@ -14,7 +12,7 @@
     $params.selectedDatasource &&
     $params.selectedDatasource !== BUDIBASE_INTERNAL_DB
 
-  function selectFirstDatasource({ detail }) {
+  function selectFirstDatasource() {
     $goto("./table")
   }
 </script>
diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.js
index cec58351a8..896f5a78e2 100644
--- a/packages/server/src/api/controllers/row/external.js
+++ b/packages/server/src/api/controllers/row/external.js
@@ -120,7 +120,7 @@ async function handleRequest(
     // pass an id filter into extra, purely for mysql/returning
     extra: {
       idFilter: buildFilters(id || generateIdForRow(row, table), {}, table),
-    }
+    },
   }
   // can't really use response right now
   const response = await makeExternalQuery(appId, json)
diff --git a/packages/server/src/api/controllers/row/internal.js b/packages/server/src/api/controllers/row/internal.js
index 49ea00b521..f0009a4413 100644
--- a/packages/server/src/api/controllers/row/internal.js
+++ b/packages/server/src/api/controllers/row/internal.js
@@ -4,7 +4,6 @@ const {
   getRowParams,
   generateRowID,
   DocumentTypes,
-  SEPARATOR,
   InternalTables,
 } = require("../../../db/utils")
 const userController = require("../user")
@@ -17,8 +16,6 @@ const { isEqual } = require("lodash")
 const { validate, findRow } = require("./utils")
 const { fullSearch, paginatedSearch } = require("./internalSearch")
 
-const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}`
-
 const CALCULATION_TYPES = {
   SUM: "sum",
   COUNT: "count",
diff --git a/packages/server/src/integrations/mysql.js b/packages/server/src/integrations/mysql.js
index e8e75d6aad..9e60958d76 100644
--- a/packages/server/src/integrations/mysql.js
+++ b/packages/server/src/integrations/mysql.js
@@ -192,7 +192,7 @@ class MySQLIntegration extends Sql {
       filters: json.extra.idFilter,
       paginate: {
         limit: 1,
-      }
+      },
     })
     return internalQuery(this.client, input, false)
   }