diff --git a/packages/api/src/main.js b/packages/api/src/main.js
index 71fb2cfb6..8d352418f 100644
--- a/packages/api/src/main.js
+++ b/packages/api/src/main.js
@@ -4,11 +4,8 @@ const bodyParser = require('body-parser');
 const fileUpload = require('express-fileupload');
 const http = require('http');
 const cors = require('cors');
-const fs = require('fs');
 const getPort = require('get-port');
-const childProcessChecker = require('./utility/childProcessChecker');
 const path = require('path');
-const crypto = require('crypto');
 
 const useController = require('./utility/useController');
 const socket = require('./utility/socket');
@@ -30,10 +27,7 @@ const queryHistory = require('./controllers/queryHistory');
 
 const { rundir } = require('./utility/directories');
 const platformInfo = require('./utility/platformInfo');
-const processArgs = require('./utility/processArgs');
-const timingSafeCheckToken = require('./utility/timingSafeCheckToken');
 
-let authorization = null;
 let checkLocalhostOrigin = null;
 
 function start() {
@@ -56,9 +50,6 @@ function start() {
   }
 
   app.use(function (req, res, next) {
-    if (authorization && !timingSafeCheckToken(req.headers.authorization, authorization)) {
-      return res.status(403).json({ error: 'Not authorized!' });
-    }
     if (checkLocalhostOrigin) {
       if (
         req.headers.origin &&
@@ -121,7 +112,7 @@ function start() {
     }
   }
 
-if (platformInfo.isNpmDist) {
+  if (platformInfo.isNpmDist) {
     app.use(express.static(path.join(__dirname, '../../dbgate-web/public')));
     getPort({ port: 5000 }).then(port => {
       server.listen(port, () => {
@@ -129,7 +120,9 @@ if (platformInfo.isNpmDist) {
       });
     });
   } else {
-    server.listen(process.env.PORT || 3000);
+    const port = process.env.PORT || 3000;
+    console.log('DbGate API listening on port', port);
+    server.listen(port);
   }
 }
 
diff --git a/packages/web/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts
index c847a3891..23e6fe9ad 100644
--- a/packages/web/src/utility/getElectron.ts
+++ b/packages/web/src/utility/getElectron.ts
@@ -1,11 +1,7 @@
 class ElectronApi {
-  // public port?: number;
-  // public authorization?: string;
   private ipcRenderer = getIpcRenderer();
 
   constructor() {
-    // this.port = args.port;
-    // this.authorization = args.authorization;
   }
 
   send(msg, args = null) {
diff --git a/packages/web/src/utility/resolveApi.ts b/packages/web/src/utility/resolveApi.ts
index afc06a485..6ad8ed302 100644
--- a/packages/web/src/utility/resolveApi.ts
+++ b/packages/web/src/utility/resolveApi.ts
@@ -6,11 +6,6 @@ try {
 } catch {}
 
 export default function resolveApi() {
-  const electron = getElectron();
-  if (electron?.port) {
-    return `http://localhost:${electron.port}`;
-  }
-
   if (apiUrl) {
     return apiUrl;
   }
@@ -20,11 +15,5 @@ export default function resolveApi() {
 export function resolveApiHeaders() {
   const electron = getElectron();
 
-  if (electron?.authorization) {
-    return {
-      Authorization: electron.authorization,
-    };
-  }
-
   return {};
 }