diff --git a/db/migrations/0220__migrate_images_to_attachments.js b/db/migrations/0220__migrate_images_to_attachments.js
index 400003514..331395914 100644
--- a/db/migrations/0220__migrate_images_to_attachments.js
+++ b/db/migrations/0220__migrate_images_to_attachments.js
@@ -2,7 +2,7 @@ module.exports = () => {
     const beccaLoader = require('../../src/becca/becca_loader.js');
     const becca = require('../../src/becca/becca.js');
     const cls = require('../../src/services/cls.js');
-    const log = require('../../src/services/log.ts');
+    const log = require('../../src/services/log');
     const sql = require('../../src/services/sql.js');
 
     cls.init(() => {
diff --git a/docker_healthcheck.js b/docker_healthcheck.js
index 8da764043..4c06a2627 100755
--- a/docker_healthcheck.js
+++ b/docker_healthcheck.js
@@ -1,7 +1,7 @@
 const http = require("http");
 const ini = require("ini");
 const fs = require("fs");
-const dataDir = require('./src/services/data_dir.ts');
+const dataDir = require('./src/services/data_dir');
 const config = ini.parse(fs.readFileSync(dataDir.CONFIG_INI_PATH, 'utf-8'));
 
 if (config.Network.https) {
diff --git a/src/becca/becca_loader.js b/src/becca/becca_loader.js
index 75d7ec0c7..98c2b700e 100644
--- a/src/becca/becca_loader.js
+++ b/src/becca/becca_loader.js
@@ -4,7 +4,7 @@ const sql = require('../services/sql.js');
 const eventService = require('../services/events.js');
 const becca = require('./becca.js');
 const sqlInit = require('../services/sql_init.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const BNote = require('./entities/bnote.js');
 const BBranch = require('./entities/bbranch.js');
 const BAttribute = require('./entities/battribute.js');
diff --git a/src/becca/becca_service.js b/src/becca/becca_service.js
index cc0c02632..936c43dcc 100644
--- a/src/becca/becca_service.js
+++ b/src/becca/becca_service.js
@@ -2,7 +2,7 @@
 
 const becca = require('./becca.js');
 const cls = require('../services/cls.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 
 function isNotePathArchived(notePath) {
     const noteId = notePath[notePath.length - 1];
diff --git a/src/becca/entities/abstract_becca_entity.js b/src/becca/entities/abstract_becca_entity.js
index 6f05dcf52..c6f99beb4 100644
--- a/src/becca/entities/abstract_becca_entity.js
+++ b/src/becca/entities/abstract_becca_entity.js
@@ -6,7 +6,7 @@ const entityChangesService = require('../../services/entity_changes.js');
 const eventService = require('../../services/events.js');
 const dateUtils = require('../../services/date_utils.js');
 const cls = require('../../services/cls.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const protectedSessionService = require('../../services/protected_session.js');
 const blobService = require('../../services/blob.js');
 
diff --git a/src/becca/entities/battachment.js b/src/becca/entities/battachment.js
index c8271e391..fedf70411 100644
--- a/src/becca/entities/battachment.js
+++ b/src/becca/entities/battachment.js
@@ -5,7 +5,7 @@ const dateUtils = require('../../services/date_utils.js');
 const AbstractBeccaEntity = require('./abstract_becca_entity.js');
 const sql = require('../../services/sql.js');
 const protectedSessionService = require('../../services/protected_session.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 
 const attachmentRoleToNoteTypeMapping = {
     'image': 'image'
diff --git a/src/becca/entities/bbranch.js b/src/becca/entities/bbranch.js
index a8208632a..b5120b0f2 100644
--- a/src/becca/entities/bbranch.js
+++ b/src/becca/entities/bbranch.js
@@ -6,7 +6,7 @@ const dateUtils = require('../../services/date_utils.js');
 const utils = require('../../services/utils.js');
 const TaskContext = require('../../services/task_context.js');
 const cls = require('../../services/cls.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 
 /**
  * Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
diff --git a/src/becca/entities/bnote.js b/src/becca/entities/bnote.js
index 118ff9976..b11a624d8 100644
--- a/src/becca/entities/bnote.js
+++ b/src/becca/entities/bnote.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const protectedSessionService = require('../../services/protected_session.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const sql = require('../../services/sql.js');
 const utils = require('../../services/utils.js');
 const dateUtils = require('../../services/date_utils.js');
diff --git a/src/becca/similarity.js b/src/becca/similarity.js
index 9e225ddcf..1a8534e0b 100644
--- a/src/becca/similarity.js
+++ b/src/becca/similarity.js
@@ -1,5 +1,5 @@
 const becca = require('./becca.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const beccaService = require('./becca_service.js');
 const dateUtils = require('../services/date_utils.js');
 const {JSDOM} = require("jsdom");
diff --git a/src/etapi/etapi_utils.js b/src/etapi/etapi_utils.js
index 662e36cbb..be8df73e5 100644
--- a/src/etapi/etapi_utils.js
+++ b/src/etapi/etapi_utils.js
@@ -1,6 +1,6 @@
 const cls = require('../services/cls.js');
 const sql = require('../services/sql.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const becca = require('../becca/becca.js');
 const etapiTokenService = require('../services/etapi_tokens.js');
 const config = require('../services/config.js');
diff --git a/src/routes/api/attributes.js b/src/routes/api/attributes.js
index f96330beb..480cb8b3f 100644
--- a/src/routes/api/attributes.js
+++ b/src/routes/api/attributes.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const sql = require('../../services/sql.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const attributeService = require('../../services/attributes.js');
 const BAttribute = require('../../becca/entities/battribute.js');
 const becca = require('../../becca/becca.js');
diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js
index 2ea2ca6c9..3d33caa5c 100644
--- a/src/routes/api/autocomplete.js
+++ b/src/routes/api/autocomplete.js
@@ -2,7 +2,7 @@
 
 const beccaService = require('../../becca/becca_service.js');
 const searchService = require('../../services/search/services/search.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const utils = require('../../services/utils.js');
 const cls = require('../../services/cls.js');
 const becca = require('../../becca/becca.js');
diff --git a/src/routes/api/backend_log.js b/src/routes/api/backend_log.js
index a3d4cc37b..c941bdaeb 100644
--- a/src/routes/api/backend_log.js
+++ b/src/routes/api/backend_log.js
@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const dateUtils = require('../../services/date_utils.js');
-const {LOG_DIR} = require('../../services/data_dir.ts');
+const {LOG_DIR} = require('../../services/data_dir');
 
 function getBackendLog() {
     const file = `${LOG_DIR}/trilium-${dateUtils.localNowDate()}.log`;
diff --git a/src/routes/api/branches.js b/src/routes/api/branches.js
index 337fdc0eb..3447b1e33 100644
--- a/src/routes/api/branches.js
+++ b/src/routes/api/branches.js
@@ -8,7 +8,7 @@ const eraseService = require('../../services/erase.js');
 const becca = require('../../becca/becca.js');
 const TaskContext = require('../../services/task_context.js');
 const branchService = require('../../services/branches.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const ValidationError = require('../../errors/validation_error.js');
 const eventService = require("../../services/events.js");
 
diff --git a/src/routes/api/clipper.js b/src/routes/api/clipper.js
index 8c38ff72e..052841cf1 100644
--- a/src/routes/api/clipper.js
+++ b/src/routes/api/clipper.js
@@ -8,7 +8,7 @@ const dateUtils = require('../../services/date_utils.js');
 const imageService = require('../../services/image.js');
 const appInfo = require('../../services/app_info.js');
 const ws = require('../../services/ws.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const utils = require('../../services/utils.js');
 const path = require('path');
 const htmlSanitizer = require('../../services/html_sanitizer.js');
diff --git a/src/routes/api/database.js b/src/routes/api/database.js
index a09750a45..6d6fcddf4 100644
--- a/src/routes/api/database.js
+++ b/src/routes/api/database.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const sql = require('../../services/sql.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const backupService = require('../../services/backup.js');
 const anonymizationService = require('../../services/anonymization.js');
 const consistencyChecksService = require('../../services/consistency_checks.js');
diff --git a/src/routes/api/export.js b/src/routes/api/export.js
index 9a7323adb..673d7c7bf 100644
--- a/src/routes/api/export.js
+++ b/src/routes/api/export.js
@@ -5,7 +5,7 @@ const singleExportService = require('../../services/export/single.js');
 const opmlExportService = require('../../services/export/opml.js');
 const becca = require('../../becca/becca.js');
 const TaskContext = require('../../services/task_context.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const NotFoundError = require('../../errors/not_found_error.js');
 
 function exportBranch(req, res) {
diff --git a/src/routes/api/files.js b/src/routes/api/files.js
index 43e64760d..60e9aba19 100644
--- a/src/routes/api/files.js
+++ b/src/routes/api/files.js
@@ -2,7 +2,7 @@
 
 const protectedSessionService = require('../../services/protected_session.js');
 const utils = require('../../services/utils.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const noteService = require('../../services/notes.js');
 const tmp = require('tmp');
 const fs = require('fs');
diff --git a/src/routes/api/import.js b/src/routes/api/import.js
index 2a9d8a594..025fb8301 100644
--- a/src/routes/api/import.js
+++ b/src/routes/api/import.js
@@ -8,7 +8,7 @@ const cls = require('../../services/cls.js');
 const path = require('path');
 const becca = require('../../becca/becca.js');
 const beccaLoader = require('../../becca/becca_loader.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');
 const ValidationError = require('../../errors/validation_error.js');
 
diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js
index d5693c137..f2c49e325 100644
--- a/src/routes/api/notes.js
+++ b/src/routes/api/notes.js
@@ -5,7 +5,7 @@ const eraseService = require('../../services/erase.js');
 const treeService = require('../../services/tree.js');
 const sql = require('../../services/sql.js');
 const utils = require('../../services/utils.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');
 const becca = require('../../becca/becca.js');
 const ValidationError = require('../../errors/validation_error.js');
diff --git a/src/routes/api/options.js b/src/routes/api/options.js
index 741634940..52344891a 100644
--- a/src/routes/api/options.js
+++ b/src/routes/api/options.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const optionService = require('../../services/options.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const searchService = require('../../services/search/services/search.js');
 const ValidationError = require('../../errors/validation_error.js');
 
diff --git a/src/routes/api/setup.js b/src/routes/api/setup.js
index a094b639c..bd328509f 100644
--- a/src/routes/api/setup.js
+++ b/src/routes/api/setup.js
@@ -2,7 +2,7 @@
 
 const sqlInit = require('../../services/sql_init.js');
 const setupService = require('../../services/setup.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const appInfo = require('../../services/app_info.js');
 
 function getStatus() {
diff --git a/src/routes/api/sync.js b/src/routes/api/sync.js
index cfe1afd88..859de6d53 100644
--- a/src/routes/api/sync.js
+++ b/src/routes/api/sync.js
@@ -7,7 +7,7 @@ const sql = require('../../services/sql.js');
 const sqlInit = require('../../services/sql_init.js');
 const optionService = require('../../services/options.js');
 const contentHashService = require('../../services/content_hash.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const syncOptions = require('../../services/sync_options.js');
 const utils = require('../../services/utils.js');
 const ws = require('../../services/ws.js');
diff --git a/src/routes/api/tree.js b/src/routes/api/tree.js
index 7162e13ba..f830ed8f1 100644
--- a/src/routes/api/tree.js
+++ b/src/routes/api/tree.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const becca = require('../../becca/becca.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const NotFoundError = require('../../errors/not_found_error.js');
 
 function getNotesAndBranchesAndAttributes(noteIds) {
diff --git a/src/routes/custom.js b/src/routes/custom.js
index 1506244d3..7352cb7f9 100644
--- a/src/routes/custom.js
+++ b/src/routes/custom.js
@@ -1,4 +1,4 @@
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const fileService = require('./api/files.js');
 const scriptService = require('../services/script.js');
 const cls = require('../services/cls.js');
diff --git a/src/routes/error_handlers.js b/src/routes/error_handlers.js
index 441da4b67..4d17b0d5d 100644
--- a/src/routes/error_handlers.js
+++ b/src/routes/error_handlers.js
@@ -1,4 +1,4 @@
-const log = require('../services/log.ts');
+const log = require('../services/log');
 
 function register(app) {
     app.use((err, req, res, next) => {
diff --git a/src/routes/index.js b/src/routes/index.js
index 7544a8bc6..92de411c4 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -4,7 +4,7 @@ const sql = require('../services/sql.js');
 const attributeService = require('../services/attributes.js');
 const config = require('../services/config.js');
 const optionService = require('../services/options.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const env = require('../services/env.js');
 const utils = require('../services/utils.js');
 const protectedSessionService = require('../services/protected_session.js');
diff --git a/src/routes/login.js b/src/routes/login.js
index 181eedc0d..15a9a9684 100644
--- a/src/routes/login.js
+++ b/src/routes/login.js
@@ -3,7 +3,7 @@
 const utils = require('../services/utils.js');
 const optionService = require('../services/options.js');
 const myScryptService = require('../services/encryption/my_scrypt.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const passwordService = require('../services/encryption/password.js');
 const assetPath = require('../services/asset_path.js');
 const appPath = require('../services/app_path.js');
diff --git a/src/routes/routes.js b/src/routes/routes.js
index 3c46763c3..081a94353 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -2,7 +2,7 @@
 
 const utils = require('../services/utils.js');
 const multer = require('multer');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const express = require('express');
 const router = express.Router();
 const auth = require('../services/auth.js');
diff --git a/src/routes/session_parser.js b/src/routes/session_parser.js
index 3ae48e356..a2e62e851 100644
--- a/src/routes/session_parser.js
+++ b/src/routes/session_parser.js
@@ -1,6 +1,6 @@
 const session = require("express-session");
 const sessionSecret = require('../services/session_secret.js');
-const dataDir = require('../services/data_dir.ts');
+const dataDir = require('../services/data_dir');
 const FileStore = require('session-file-store')(session);
 
 const sessionParser = session({
diff --git a/src/services/anonymization.js b/src/services/anonymization.js
index 8e79cd496..792d83c9c 100644
--- a/src/services/anonymization.js
+++ b/src/services/anonymization.js
@@ -1,6 +1,6 @@
 const BUILTIN_ATTRIBUTES = require('./builtin_attributes.js');
 const fs = require("fs-extra");
-const dataDir = require('./data_dir.ts');
+const dataDir = require('./data_dir');
 const dateUtils = require('./date_utils.js');
 const Database = require("better-sqlite3");
 const sql = require('./sql.js');
diff --git a/src/services/app_icon.js b/src/services/app_icon.js
index 04f9d034d..784850508 100644
--- a/src/services/app_icon.js
+++ b/src/services/app_icon.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const {ELECTRON_APP_ROOT_DIR} = require('./resource_dir.js');
-const log = require('./log.ts');
+const log = require('./log');
 const os = require('os');
 const fs = require('fs');
 const config = require('./config.js');
diff --git a/src/services/app_info.js b/src/services/app_info.js
index 52f7dea7e..1d419a4bf 100644
--- a/src/services/app_info.js
+++ b/src/services/app_info.js
@@ -2,7 +2,7 @@
 
 const build = require('./build.js');
 const packageJson = require('../../package.json');
-const {TRILIUM_DATA_DIR} = require('./data_dir.ts');
+const {TRILIUM_DATA_DIR} = require('./data_dir');
 
 const APP_DB_VERSION = 228;
 const SYNC_VERSION = 32;
diff --git a/src/services/auth.js b/src/services/auth.js
index cb31a9889..e16fa9ba5 100644
--- a/src/services/auth.js
+++ b/src/services/auth.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const etapiTokenService = require('./etapi_tokens.js');
-const log = require('./log.ts');
+const log = require('./log');
 const sqlInit = require('./sql_init.js');
 const utils = require('./utils.js');
 const passwordEncryptionService = require('./encryption/password_encryption.js');
diff --git a/src/services/backend_script_api.js b/src/services/backend_script_api.js
index 36d1fb915..12732d6a0 100644
--- a/src/services/backend_script_api.js
+++ b/src/services/backend_script_api.js
@@ -1,4 +1,4 @@
-const log = require('./log.ts');
+const log = require('./log');
 const noteService = require('./notes.js');
 const sql = require('./sql.js');
 const utils = require('./utils.js');
diff --git a/src/services/backup.js b/src/services/backup.js
index 9580bef84..58c8570b2 100644
--- a/src/services/backup.js
+++ b/src/services/backup.js
@@ -3,8 +3,8 @@
 const dateUtils = require('./date_utils.js');
 const optionService = require('./options.js');
 const fs = require('fs-extra');
-const dataDir = require('./data_dir.ts');
-const log = require('./log.ts');
+const dataDir = require('./data_dir');
+const log = require('./log');
 const syncMutexService = require('./sync_mutex.js');
 const cls = require('./cls.js');
 const sql = require('./sql.js');
diff --git a/src/services/bulk_actions.js b/src/services/bulk_actions.js
index 14ff03ccd..38f649723 100644
--- a/src/services/bulk_actions.js
+++ b/src/services/bulk_actions.js
@@ -1,4 +1,4 @@
-const log = require('./log.ts');
+const log = require('./log');
 const revisionService = require('./revisions.js');
 const becca = require('../becca/becca.js');
 const cloningService = require('./cloning.js');
diff --git a/src/services/cloning.js b/src/services/cloning.js
index 1181983ac..6c2f0c161 100644
--- a/src/services/cloning.js
+++ b/src/services/cloning.js
@@ -5,7 +5,7 @@ const eventChangesService = require('./entity_changes.js');
 const treeService = require('./tree.js');
 const BBranch = require('../becca/entities/bbranch.js');
 const becca = require('../becca/becca.js');
-const log = require('./log.ts');
+const log = require('./log');
 
 function cloneNoteToParentNote(noteId, parentNoteId, prefix = null) {
     if (!(noteId in becca.notes) || !(parentNoteId in becca.notes)) {
diff --git a/src/services/config.js b/src/services/config.js
index 3349be88a..c57942a8c 100644
--- a/src/services/config.js
+++ b/src/services/config.js
@@ -2,7 +2,7 @@
 
 const ini = require('ini');
 const fs = require('fs');
-const dataDir = require('./data_dir.ts');
+const dataDir = require('./data_dir');
 const path = require('path');
 const resourceDir = require('./resource_dir.js');
 
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index 901a54dbd..54ca3eed3 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -2,7 +2,7 @@
 
 const sql = require('./sql.js');
 const sqlInit = require('./sql_init.js');
-const log = require('./log.ts');
+const log = require('./log');
 const ws = require('./ws.js');
 const syncMutexService = require('./sync_mutex.js');
 const cls = require('./cls.js');
diff --git a/src/services/content_hash.js b/src/services/content_hash.js
index 2858b3cac..0251e0cd6 100644
--- a/src/services/content_hash.js
+++ b/src/services/content_hash.js
@@ -2,7 +2,7 @@
 
 const sql = require('./sql.js');
 const utils = require('./utils.js');
-const log = require('./log.ts');
+const log = require('./log');
 const eraseService = require('./erase.js');
 
 function getEntityHashes() {
diff --git a/src/services/encryption/data_encryption.js b/src/services/encryption/data_encryption.js
index fcd5c2f36..2b18058c5 100644
--- a/src/services/encryption/data_encryption.js
+++ b/src/services/encryption/data_encryption.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const crypto = require('crypto');
-const log = require('../log.ts');
+const log = require('../log');
 
 function arraysIdentical(a, b) {
     let i = a.length;
diff --git a/src/services/entity_changes.js b/src/services/entity_changes.js
index 19c154a50..dcd93d2d0 100644
--- a/src/services/entity_changes.js
+++ b/src/services/entity_changes.js
@@ -1,6 +1,6 @@
 const sql = require('./sql.js');
 const dateUtils = require('./date_utils.js');
-const log = require('./log.ts');
+const log = require('./log');
 const cls = require('./cls.js');
 const utils = require('./utils.js');
 const instanceId = require('./instance_id.js');
diff --git a/src/services/events.js b/src/services/events.js
index 849af3c52..51c30be17 100644
--- a/src/services/events.js
+++ b/src/services/events.js
@@ -1,4 +1,4 @@
-const log = require('./log.ts');
+const log = require('./log');
 
 const NOTE_TITLE_CHANGED = "NOTE_TITLE_CHANGED";
 const ENTER_PROTECTED_SESSION = "ENTER_PROTECTED_SESSION";
diff --git a/src/services/export/zip.js b/src/services/export/zip.js
index 87ee4d4e4..153b05f58 100644
--- a/src/services/export/zip.js
+++ b/src/services/export/zip.js
@@ -13,7 +13,7 @@ const fs = require("fs");
 const becca = require('../../becca/becca.js');
 const RESOURCE_DIR = require('../../services/resource_dir.js').RESOURCE_DIR;
 const archiver = require('archiver');
-const log = require('../log.ts');
+const log = require('../log');
 const TaskContext = require('../task_context.js');
 const ValidationError = require('../../errors/validation_error.js');
 const NoteMeta = require('../meta/note_meta.js');
diff --git a/src/services/hidden_subtree.js b/src/services/hidden_subtree.js
index d96c73b1f..2e00a2461 100644
--- a/src/services/hidden_subtree.js
+++ b/src/services/hidden_subtree.js
@@ -1,7 +1,7 @@
 const becca = require('../becca/becca.js');
 const noteService = require('./notes.js');
 const BAttribute = require('../becca/entities/battribute.js');
-const log = require('./log.ts');
+const log = require('./log');
 const migrationService = require('./migration.js');
 
 const LBTPL_ROOT = "_lbTplRoot";
diff --git a/src/services/image.js b/src/services/image.js
index ee795ebd8..8ef302708 100644
--- a/src/services/image.js
+++ b/src/services/image.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const becca = require('../becca/becca.js');
-const log = require('./log.ts');
+const log = require('./log');
 const protectedSessionService = require('./protected_session.js');
 const noteService = require('./notes.js');
 const optionService = require('./options.js');
diff --git a/src/services/import/enex.js b/src/services/import/enex.js
index 73d0da225..50f0c5549 100644
--- a/src/services/import/enex.js
+++ b/src/services/import/enex.js
@@ -1,7 +1,7 @@
 const sax = require("sax");
 const stream = require('stream');
 const {Throttle} = require('stream-throttle');
-const log = require('../log.ts');
+const log = require('../log');
 const utils = require('../utils.js');
 const sql = require('../sql.js');
 const noteService = require('../notes.js');
diff --git a/src/services/import/zip.js b/src/services/import/zip.js
index 7b12130c8..0df5fff4c 100644
--- a/src/services/import/zip.js
+++ b/src/services/import/zip.js
@@ -2,7 +2,7 @@
 
 const BAttribute = require('../../becca/entities/battribute.js');
 const utils = require('../../services/utils.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const noteService = require('../../services/notes.js');
 const attributeService = require('../../services/attributes.js');
 const BBranch = require('../../becca/entities/bbranch.js');
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index bcc8b3cd9..697d1f4c7 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const optionService = require('./options.js');
-const log = require('./log.ts');
+const log = require('./log');
 const utils = require('./utils.js');
 
 const isMac = process.platform === "darwin";
diff --git a/src/services/log.ts b/src/services/log.ts
index a07e27124..ce59b1530 100644
--- a/src/services/log.ts
+++ b/src/services/log.ts
@@ -2,7 +2,7 @@
 
 import { Request, Response } from "express";
 import fs = require("fs");
-import dataDir = require('./data_dir.ts');
+import dataDir = require('./data_dir');
 import cls = require('./cls.js');
 
 if (!fs.existsSync(dataDir.LOG_DIR)) {
diff --git a/src/services/migration.js b/src/services/migration.js
index 8dce4c755..d0b48651d 100644
--- a/src/services/migration.js
+++ b/src/services/migration.js
@@ -1,7 +1,7 @@
 const backupService = require('./backup.js');
 const sql = require('./sql.js');
 const fs = require('fs-extra');
-const log = require('./log.ts');
+const log = require('./log');
 const utils = require('./utils.js');
 const resourceDir = require('./resource_dir.js');
 const appInfo = require('./app_info.js');
diff --git a/src/services/notes.js b/src/services/notes.js
index d699502e8..977a8f4f7 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -5,7 +5,7 @@ const entityChangesService = require('./entity_changes.js');
 const eventService = require('./events.js');
 const cls = require('../services/cls.js');
 const protectedSessionService = require('../services/protected_session.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 const utils = require('../services/utils.js');
 const revisionService = require('./revisions.js');
 const request = require('./request.js');
diff --git a/src/services/options_init.js b/src/services/options_init.js
index 9f3add64b..46dca53e2 100644
--- a/src/services/options_init.js
+++ b/src/services/options_init.js
@@ -1,7 +1,7 @@
 const optionService = require('./options.js');
 const appInfo = require('./app_info.js');
 const utils = require('./utils.js');
-const log = require('./log.ts');
+const log = require('./log');
 const dateUtils = require('./date_utils.js');
 const keyboardActions = require('./keyboard_actions.js');
 
diff --git a/src/services/port.js b/src/services/port.js
index 2ad054e14..fe31eec35 100644
--- a/src/services/port.js
+++ b/src/services/port.js
@@ -1,7 +1,7 @@
 const config = require('./config.js');
 const utils = require('./utils.js');
 const env = require('./env.js');
-const dataDir = require('./data_dir.ts');
+const dataDir = require('./data_dir');
 
 function parseAndValidate(portStr, source) {
     const portNum = parseInt(portStr);
diff --git a/src/services/protected_session.js b/src/services/protected_session.js
index c1d6b0986..fad80c035 100644
--- a/src/services/protected_session.js
+++ b/src/services/protected_session.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const log = require('./log.ts');
+const log = require('./log');
 const dataEncryptionService = require('./encryption/data_encryption.js');
 
 let dataKey = null;
diff --git a/src/services/request.js b/src/services/request.js
index 696f41939..158495779 100644
--- a/src/services/request.js
+++ b/src/services/request.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require('./utils.js');
-const log = require('./log.ts');
+const log = require('./log');
 const url = require('url');
 const syncOptions = require('./sync_options.js');
 
diff --git a/src/services/resource_dir.js b/src/services/resource_dir.js
index cbf1dea91..4f3710e18 100644
--- a/src/services/resource_dir.js
+++ b/src/services/resource_dir.js
@@ -1,4 +1,4 @@
-const log = require('./log.ts');
+const log = require('./log');
 const path = require('path');
 const fs = require('fs');
 
diff --git a/src/services/revisions.js b/src/services/revisions.js
index 8cdff23a8..5735ceb79 100644
--- a/src/services/revisions.js
+++ b/src/services/revisions.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const log = require('./log.ts');
+const log = require('./log');
 const sql = require('./sql.js');
 const protectedSessionService = require('./protected_session.js');
 const dateUtils = require('./date_utils.js');
diff --git a/src/services/scheduler.js b/src/services/scheduler.js
index 6f7dc25fb..1e03a3d34 100644
--- a/src/services/scheduler.js
+++ b/src/services/scheduler.js
@@ -2,7 +2,7 @@ const scriptService = require('./script.js');
 const cls = require('./cls.js');
 const sqlInit = require('./sql_init.js');
 const config = require('./config.js');
-const log = require('./log.ts');
+const log = require('./log');
 const attributeService = require('../services/attributes.js');
 const protectedSessionService = require('../services/protected_session.js');
 const hiddenSubtreeService = require('./hidden_subtree.js');
diff --git a/src/services/script.js b/src/services/script.js
index 4c26a37f7..24ff7f04a 100644
--- a/src/services/script.js
+++ b/src/services/script.js
@@ -1,6 +1,6 @@
 const ScriptContext = require('./script_context.js');
 const cls = require('./cls.js');
-const log = require('./log.ts');
+const log = require('./log');
 const becca = require('../becca/becca.js');
 
 function executeNote(note, apiParams) {
diff --git a/src/services/search/expressions/ancestor.js b/src/services/search/expressions/ancestor.js
index d1d93eed2..f7463a3ae 100644
--- a/src/services/search/expressions/ancestor.js
+++ b/src/services/search/expressions/ancestor.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression.js');
 const NoteSet = require('../note_set.js');
-const log = require('../../log.ts');
+const log = require('../../log');
 const becca = require('../../../becca/becca.js');
 
 class AncestorExp extends Expression {
diff --git a/src/services/search/expressions/note_content_fulltext.js b/src/services/search/expressions/note_content_fulltext.js
index b4c90005f..f9eac3699 100644
--- a/src/services/search/expressions/note_content_fulltext.js
+++ b/src/services/search/expressions/note_content_fulltext.js
@@ -2,7 +2,7 @@
 
 const Expression = require('./expression.js');
 const NoteSet = require('../note_set.js');
-const log = require('../../log.ts');
+const log = require('../../log');
 const becca = require('../../../becca/becca.js');
 const protectedSessionService = require('../../protected_session.js');
 const striptags = require('striptags');
diff --git a/src/services/search/services/search.js b/src/services/search/services/search.js
index 68ab55226..ac794e7d0 100644
--- a/src/services/search/services/search.js
+++ b/src/services/search/services/search.js
@@ -9,7 +9,7 @@ const SearchContext = require('../search_context.js');
 const becca = require('../../../becca/becca.js');
 const beccaService = require('../../../becca/becca_service.js');
 const utils = require('../../utils.js');
-const log = require('../../log.ts');
+const log = require('../../log');
 const hoistedNoteService = require('../../hoisted_note.js');
 
 function searchFromNote(note) {
diff --git a/src/services/session_secret.js b/src/services/session_secret.js
index 711255ab1..16c1ed8c3 100644
--- a/src/services/session_secret.js
+++ b/src/services/session_secret.js
@@ -2,8 +2,8 @@
 
 const fs = require('fs');
 const crypto = require('crypto');
-const dataDir = require('./data_dir.ts');
-const log = require('./log.ts');
+const dataDir = require('./data_dir');
+const log = require('./log');
 
 const sessionSecretPath = `${dataDir.TRILIUM_DATA_DIR}/session_secret.txt`;
 
diff --git a/src/services/setup.js b/src/services/setup.js
index 6c7156ebc..1bebad29a 100644
--- a/src/services/setup.js
+++ b/src/services/setup.js
@@ -1,5 +1,5 @@
 const syncService = require('./sync.js');
-const log = require('./log.ts');
+const log = require('./log');
 const sqlInit = require('./sql_init.js');
 const optionService = require('./options.js');
 const syncOptions = require('./sync_options.js');
diff --git a/src/services/special_notes.js b/src/services/special_notes.js
index 09ce82a69..8d9c2baa1 100644
--- a/src/services/special_notes.js
+++ b/src/services/special_notes.js
@@ -3,7 +3,7 @@ const dateNoteService = require('./date_notes.js');
 const becca = require('../becca/becca.js');
 const noteService = require('./notes.js');
 const dateUtils = require('./date_utils.js');
-const log = require('./log.ts');
+const log = require('./log');
 const hoistedNoteService = require('./hoisted_note.js');
 const searchService = require('./search/services/search.js');
 const SearchContext = require('./search/search_context.js');
diff --git a/src/services/sql.js b/src/services/sql.js
index 53d7d8d45..3b165d4d6 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -4,9 +4,9 @@
  * @module sql
  */
 
-const log = require('./log.ts');
+const log = require('./log');
 const Database = require('better-sqlite3');
-const dataDir = require('./data_dir.ts');
+const dataDir = require('./data_dir');
 const cls = require('./cls.js');
 const fs = require("fs-extra");
 
diff --git a/src/services/sql_init.js b/src/services/sql_init.js
index 572334f13..7b348dd8b 100644
--- a/src/services/sql_init.js
+++ b/src/services/sql_init.js
@@ -1,4 +1,4 @@
-const log = require('./log.ts');
+const log = require('./log');
 const fs = require('fs');
 const resourceDir = require('./resource_dir.js');
 const sql = require('./sql.js');
diff --git a/src/services/sync.js b/src/services/sync.js
index 7d64cac57..8326bd1d8 100644
--- a/src/services/sync.js
+++ b/src/services/sync.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const log = require('./log.ts');
+const log = require('./log');
 const sql = require('./sql.js');
 const optionService = require('./options.js');
 const utils = require('./utils.js');
diff --git a/src/services/sync_update.js b/src/services/sync_update.js
index 3a1577971..f9695ba0c 100644
--- a/src/services/sync_update.js
+++ b/src/services/sync_update.js
@@ -1,5 +1,5 @@
 const sql = require('./sql.js');
-const log = require('./log.ts');
+const log = require('./log');
 const entityChangesService = require('./entity_changes.js');
 const eventService = require('./events.js');
 const entityConstructor = require('../becca/entity_constructor.js');
diff --git a/src/services/tree.js b/src/services/tree.js
index 239a9ab35..0ca25c536 100644
--- a/src/services/tree.js
+++ b/src/services/tree.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const sql = require('./sql.js');
-const log = require('./log.ts');
+const log = require('./log');
 const BBranch = require('../becca/entities/bbranch.js');
 const entityChangesService = require('./entity_changes.js');
 const becca = require('../becca/becca.js');
diff --git a/src/services/window.js b/src/services/window.js
index 97a60db91..8468e048c 100644
--- a/src/services/window.js
+++ b/src/services/window.js
@@ -3,7 +3,7 @@ const url = require("url");
 const port = require('./port.js');
 const optionService = require('./options.js');
 const env = require('./env.js');
-const log = require('./log.ts');
+const log = require('./log');
 const sqlInit = require('./sql_init.js');
 const cls = require('./cls.js');
 const keyboardActionsService = require('./keyboard_actions.js');
diff --git a/src/services/ws.js b/src/services/ws.js
index 759e0823c..85628b235 100644
--- a/src/services/ws.js
+++ b/src/services/ws.js
@@ -1,6 +1,6 @@
 const WebSocket = require('ws');
 const utils = require('./utils.js');
-const log = require('./log.ts');
+const log = require('./log');
 const sql = require('./sql.js');
 const cls = require('./cls.js');
 const config = require('./config.js');
diff --git a/src/share/routes.js b/src/share/routes.js
index 95d6c1a9f..5db054011 100644
--- a/src/share/routes.js
+++ b/src/share/routes.js
@@ -11,7 +11,7 @@ const assetPath = require('../services/asset_path.js');
 const appPath = require('../services/app_path.js');
 const searchService = require('../services/search/services/search.js');
 const SearchContext = require('../services/search/search_context.js');
-const log = require('../services/log.ts');
+const log = require('../services/log');
 
 /**
  * @param {SNote} note
diff --git a/src/share/shaca/shaca_loader.js b/src/share/shaca/shaca_loader.js
index 83c755e36..850b820a4 100644
--- a/src/share/shaca/shaca_loader.js
+++ b/src/share/shaca/shaca_loader.js
@@ -2,7 +2,7 @@
 
 const sql = require('../sql.js');
 const shaca = require('./shaca.js');
-const log = require('../../services/log.ts');
+const log = require('../../services/log');
 const SNote = require('./entities/snote.js');
 const SBranch = require('./entities/sbranch.js');
 const SAttribute = require('./entities/sattribute.js');
diff --git a/src/share/sql.js b/src/share/sql.js
index 1dab6d555..485c87921 100644
--- a/src/share/sql.js
+++ b/src/share/sql.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const Database = require('better-sqlite3');
-const dataDir = require('../services/data_dir.ts');
+const dataDir = require('../services/data_dir');
 
 const dbConnection = new Database(dataDir.DOCUMENT_PATH, { readonly: true });
 
diff --git a/tsconfig.json b/tsconfig.json
index 07cb010e9..7f94100dc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,6 @@
 	  "sourceMap": true,
 	  "outDir": "./build",
 	  "strict": true,
-	  "allowImportingTsExtensions": true,
 	  "noImplicitAny": true
 	},
 	"include": [