diff --git a/packages/api/src/controllers/jsldata.js b/packages/api/src/controllers/jsldata.js
index e1cede325..2b08b9518 100644
--- a/packages/api/src/controllers/jsldata.js
+++ b/packages/api/src/controllers/jsldata.js
@@ -1,4 +1,3 @@
-const _ = require('lodash');
 const path = require('path');
 const fs = require('fs');
 const lineReader = require('line-reader');
diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js
index 28274ffa7..d30dfd5bc 100644
--- a/packages/api/src/controllers/sessions.js
+++ b/packages/api/src/controllers/sessions.js
@@ -3,7 +3,6 @@ const uuidv1 = require('uuid/v1');
 const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
-const DatabaseAnalyser = require('@dbgate/engines/default/DatabaseAnalyser');
 
 module.exports = {
   /** @type {import('@dbgate/types').OpenedSession[]} */
diff --git a/packages/api/src/proc/databaseConnectionProcess.js b/packages/api/src/proc/databaseConnectionProcess.js
index a1b0ea987..84c6a4240 100644
--- a/packages/api/src/proc/databaseConnectionProcess.js
+++ b/packages/api/src/proc/databaseConnectionProcess.js
@@ -1,5 +1,4 @@
 const engines = require('@dbgate/engines');
-const { Select } = require('@dbgate/sqltree');
 const driverConnect = require('../utility/driverConnect');
 
 let systemConnection;
@@ -19,7 +18,7 @@ async function handleConnect(connection) {
   systemConnection = await driverConnect(driver, storedConnection);
   handleFullRefresh();
   setInterval(handleFullRefresh, 30 * 1000);
-  for (const [resolve, reject] of afterConnectCallbacks) {
+  for (const [resolve] of afterConnectCallbacks) {
     resolve();
   }
   afterConnectCallbacks = [];
diff --git a/packages/api/src/proc/sessionProcess.js b/packages/api/src/proc/sessionProcess.js
index a7404e264..19cbc237c 100644
--- a/packages/api/src/proc/sessionProcess.js
+++ b/packages/api/src/proc/sessionProcess.js
@@ -55,7 +55,7 @@ async function handleConnect(connection) {
 
   const driver = engines(storedConnection);
   systemConnection = await driverConnect(driver, storedConnection);
-  for (const [resolve, reject] of afterConnectCallbacks) {
+  for (const [resolve] of afterConnectCallbacks) {
     resolve();
   }
   afterConnectCallbacks = [];
diff --git a/packages/datalib/src/GridDisplay.ts b/packages/datalib/src/GridDisplay.ts
index f8a1b6daa..14e5bc956 100644
--- a/packages/datalib/src/GridDisplay.ts
+++ b/packages/datalib/src/GridDisplay.ts
@@ -7,8 +7,8 @@ import { Select, Expression } from '@dbgate/sqltree';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
 
 export interface DisplayColumn {
-  schemaName?: string;
-  pureName?: string;
+  schemaName: string;
+  pureName: string;
   columnName: string;
   headerText: string;
   uniqueName: string;
diff --git a/packages/datalib/src/JslGridDisplay.ts b/packages/datalib/src/JslGridDisplay.ts
index 0119a87a4..7b4952f59 100644
--- a/packages/datalib/src/JslGridDisplay.ts
+++ b/packages/datalib/src/JslGridDisplay.ts
@@ -12,7 +12,7 @@ export class JslGridDisplay extends GridDisplay {
     setCache: ChangeCacheFunc
   ) {
     super(config, setConfig, cache, setCache, null, null);
-    
+
     this.columns = columns
       .map((col) => ({
         columnName: col.columnName,
@@ -21,6 +21,8 @@ export class JslGridDisplay extends GridDisplay {
         uniquePath: [col.columnName],
         notNull: col.notNull,
         autoIncrement: col.autoIncrement,
+        pureName: null,
+        schemaName: null,
       }))
       ?.map((col) => ({
         ...col,
diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js
index af642907f..d92f05931 100644
--- a/packages/web/src/datagrid/DataGridCore.js
+++ b/packages/web/src/datagrid/DataGridCore.js
@@ -1,28 +1,14 @@
-import moment from 'moment';
 import _ from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import useFetch from '../utility/useFetch';
 import styled from 'styled-components';
-import theme from '../theme';
 import { HorizontalScrollBar, VerticalScrollBar } from './ScrollBars';
 import useDimensions from '../utility/useDimensions';
-import { SeriesSizes } from './SeriesSizes';
 import axios from '../utility/axios';
-import ColumnLabel from './ColumnLabel';
 import DataFilterControl from './DataFilterControl';
 import { getFilterType } from '@dbgate/filterparser';
-import {
-  convertCellAddress,
-  cellFromEvent,
-  getCellRange,
-  topLeftCell,
-  isRegularCell,
-  nullCell,
-  emptyCellArray,
-} from './selection';
+import { cellFromEvent, getCellRange, topLeftCell, isRegularCell, nullCell, emptyCellArray } from './selection';
 import keycodes from '../utility/keycodes';
-import InplaceEditor from './InplaceEditor';
 import DataGridRow from './DataGridRow';
 import {
   countColumnSizes,
@@ -44,10 +30,9 @@ import {
   setChangeSetValue,
 } from '@dbgate/datalib';
 import { scriptToSql } from '@dbgate/sqltree';
-import { sleep } from '../utility/common';
 import { copyTextToClipboard } from '../utility/clipboard';
 import DataGridToolbar from './DataGridToolbar';
-import usePropsCompare from '../utility/usePropsCompare';
+// import usePropsCompare from '../utility/usePropsCompare';
 import ColumnHeaderControl from './ColumnHeaderControl';
 import InlineButton from '../widgets/InlineButton';
 import { showMenu } from '../modals/DropDownMenu';
@@ -142,7 +127,7 @@ async function loadDataPage(props, offset, limit) {
 }
 
 function dataPageAvailable(props) {
-  const { display, conid, database, jslid } = props;
+  const { display, jslid } = props;
   if (jslid) return true;
   const sql = display.getPageQuery(0, 1);
   return !!sql;
@@ -248,7 +233,7 @@ export default function DataGridCore(props) {
   const [headerRowRef, { height: rowHeight }] = useDimensions();
   const [tableBodyRef] = useDimensions();
   const [containerRef, { height: containerHeight, width: containerWidth }] = useDimensions();
-  const [tableRef, { height: tableHeight, width: tableWidth }] = useDimensions();
+  // const [tableRef, { height: tableHeight, width: tableWidth }] = useDimensions();
   const confirmSqlModalState = useModalState();
   const [confirmSql, setConfirmSql] = React.useState('');
 
@@ -637,7 +622,7 @@ export default function DataGridCore(props) {
   }
 
   async function handleConfirmSql() {
-    const response = await axios.request({
+    await axios.request({
       url: 'database-connections/query-data',
       method: 'post',
       params: {
@@ -899,7 +884,7 @@ export default function DataGridCore(props) {
         onMouseMove={handleGridMouseMove}
         onMouseUp={handleGridMouseUp}
         onWheel={handleGridWheel}
-        ref={tableRef}
+        // ref={tableRef}
         onContextMenu={handleContextMenu}
       >
         <TableHead>
diff --git a/packages/web/src/datagrid/DataGridRow.js b/packages/web/src/datagrid/DataGridRow.js
index b140c093d..3b70b7bb3 100644
--- a/packages/web/src/datagrid/DataGridRow.js
+++ b/packages/web/src/datagrid/DataGridRow.js
@@ -2,20 +2,9 @@
 import moment from 'moment';
 import _ from 'lodash';
 import React from 'react';
-import useFetch from '../utility/useFetch';
 import styled from 'styled-components';
-import theme from '../theme';
-import { HorizontalScrollBar, VerticalScrollBar } from './ScrollBars';
-import useDimensions from '../utility/useDimensions';
-import { SeriesSizes } from './SeriesSizes';
-import axios from '../utility/axios';
-import ColumnLabel from './ColumnLabel';
-import DataFilterControl from './DataFilterControl';
-import { getFilterType } from '@dbgate/filterparser';
 import { findExistingChangeSetItem } from '@dbgate/datalib';
-import keycodes from '../utility/keycodes';
 import InplaceEditor from './InplaceEditor';
-import usePropsCompare from '../utility/usePropsCompare';
 import { cellIsSelected } from './gridutil';
 
 const TableBodyCell = styled.td`
diff --git a/packages/web/src/sqleditor/SqlEditor.js b/packages/web/src/sqleditor/SqlEditor.js
index 2a2099b1b..881681760 100644
--- a/packages/web/src/sqleditor/SqlEditor.js
+++ b/packages/web/src/sqleditor/SqlEditor.js
@@ -1,12 +1,7 @@
 import React from 'react';
-import useFetch from '../utility/useFetch';
 import styled from 'styled-components';
-import theme from '../theme';
 import AceEditor from 'react-ace';
 import useDimensions from '../utility/useDimensions';
-import engines from '@dbgate/engines';
-import useTableInfo from '../utility/useTableInfo';
-import useConnectionInfo from '../utility/useConnectionInfo';
 
 const Wrapper = styled.div`
   position: absolute;
diff --git a/packages/web/src/tabs/QueryTab.js b/packages/web/src/tabs/QueryTab.js
index 8370495ea..137af9c48 100644
--- a/packages/web/src/tabs/QueryTab.js
+++ b/packages/web/src/tabs/QueryTab.js
@@ -2,16 +2,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import _ from 'lodash';
 import axios from '../utility/axios';
-import engines from '@dbgate/engines';
-import useTableInfo from '../utility/useTableInfo';
 import useConnectionInfo from '../utility/useConnectionInfo';
 import SqlEditor from '../sqleditor/SqlEditor';
 import { useUpdateDatabaseForTab } from '../utility/globalState';
 import QueryToolbar from '../query/QueryToolbar';
-import styled from 'styled-components';
 import SessionMessagesView from '../query/SessionMessagesView';
-import { TabPage, TabControl } from '../widgets/TabControl';
-import getResultTabs from '../sqleditor/ResultTabs';
+import { TabPage } from '../widgets/TabControl';
 import ResultTabs from '../sqleditor/ResultTabs';
 import { VerticalSplitter } from '../widgets/Splitter';
 
@@ -67,13 +63,13 @@ export default function QueryTab({ tabid, conid, database, tabVisible, toolbarPo
       sesid = resp.data.sesid;
       setSessionId(sesid);
     }
-    const resp2 = await axios.post('sessions/execute-query', {
+    await axios.post('sessions/execute-query', {
       sesid,
       sql: queryText,
     });
   };
 
-  const handleKeyDown = (e) => {};
+  const handleKeyDown = () => {};
 
   const handleMesageClick = (message) => {
     // console.log('EDITOR', editorRef.current.editor);