diff --git a/database/deleteLotField.d.ts b/database/deleteLotField.d.ts
index a838d420..1d3d7a93 100644
--- a/database/deleteLotField.d.ts
+++ b/database/deleteLotField.d.ts
@@ -1,3 +1,2 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-export declare function deleteLotField(lotId: number | string, lotTypeFieldId: number | string, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
-export default deleteLotField;
+export default function deleteLotField(lotId: number | string, lotTypeFieldId: number | string, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
diff --git a/database/deleteLotField.js b/database/deleteLotField.js
index 8a4fc1b8..c52d59c3 100644
--- a/database/deleteLotField.js
+++ b/database/deleteLotField.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteLotField(lotId, lotTypeFieldId, user, connectedDatabase) {
+export default async function deleteLotField(lotId, lotTypeFieldId, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     const result = database
         .prepare(`update LotFields
@@ -13,4 +13,3 @@ export async function deleteLotField(lotId, lotTypeFieldId, user, connectedDatab
     }
     return result.changes > 0;
 }
-export default deleteLotField;
diff --git a/database/deleteLotField.ts b/database/deleteLotField.ts
index 7c53b763..3ac93c9d 100644
--- a/database/deleteLotField.ts
+++ b/database/deleteLotField.ts
@@ -2,7 +2,7 @@ import type { PoolConnection } from 'better-sqlite-pool'
 
 import { acquireConnection } from './pool.js'
 
-export async function deleteLotField(
+export default async function deleteLotField(
   lotId: number | string,
   lotTypeFieldId: number | string,
   user: User,
@@ -26,5 +26,3 @@ export async function deleteLotField(
 
   return result.changes > 0
 }
-
-export default deleteLotField
diff --git a/database/deleteLotOccupancyFee.d.ts b/database/deleteLotOccupancyFee.d.ts
index 6e6064f0..83d67eed 100644
--- a/database/deleteLotOccupancyFee.d.ts
+++ b/database/deleteLotOccupancyFee.d.ts
@@ -1,2 +1 @@
-export declare function deleteLotOccupancyFee(lotOccupancyId: number | string, feeId: number | string, user: User): Promise<boolean>;
-export default deleteLotOccupancyFee;
+export default function deleteLotOccupancyFee(lotOccupancyId: number | string, feeId: number | string, user: User): Promise<boolean>;
diff --git a/database/deleteLotOccupancyFee.js b/database/deleteLotOccupancyFee.js
index f84200ce..40e60737 100644
--- a/database/deleteLotOccupancyFee.js
+++ b/database/deleteLotOccupancyFee.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteLotOccupancyFee(lotOccupancyId, feeId, user) {
+export default async function deleteLotOccupancyFee(lotOccupancyId, feeId, user) {
     const database = await acquireConnection();
     const result = database
         .prepare(`update LotOccupancyFees
@@ -11,4 +11,3 @@ export async function deleteLotOccupancyFee(lotOccupancyId, feeId, user) {
     database.release();
     return result.changes > 0;
 }
-export default deleteLotOccupancyFee;
diff --git a/database/deleteLotOccupancyFee.ts b/database/deleteLotOccupancyFee.ts
index 6fc91a10..67293547 100644
--- a/database/deleteLotOccupancyFee.ts
+++ b/database/deleteLotOccupancyFee.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-export async function deleteLotOccupancyFee(
+export default async function deleteLotOccupancyFee(
   lotOccupancyId: number | string,
   feeId: number | string,
   user: User
@@ -21,5 +21,3 @@ export async function deleteLotOccupancyFee(
 
   return result.changes > 0
 }
-
-export default deleteLotOccupancyFee
diff --git a/database/deleteLotOccupancyField.d.ts b/database/deleteLotOccupancyField.d.ts
index cea22b42..e7228f85 100644
--- a/database/deleteLotOccupancyField.d.ts
+++ b/database/deleteLotOccupancyField.d.ts
@@ -1,3 +1,2 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-export declare function deleteLotOccupancyField(lotOccupancyId: number | string, occupancyTypeFieldId: number | string, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
-export default deleteLotOccupancyField;
+export default function deleteLotOccupancyField(lotOccupancyId: number | string, occupancyTypeFieldId: number | string, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
diff --git a/database/deleteLotOccupancyField.js b/database/deleteLotOccupancyField.js
index 28959748..04f0130c 100644
--- a/database/deleteLotOccupancyField.js
+++ b/database/deleteLotOccupancyField.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteLotOccupancyField(lotOccupancyId, occupancyTypeFieldId, user, connectedDatabase) {
+export default async function deleteLotOccupancyField(lotOccupancyId, occupancyTypeFieldId, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     const result = database
         .prepare(`update LotOccupancyFields
@@ -13,4 +13,3 @@ export async function deleteLotOccupancyField(lotOccupancyId, occupancyTypeField
     }
     return result.changes > 0;
 }
-export default deleteLotOccupancyField;
diff --git a/database/deleteLotOccupancyField.ts b/database/deleteLotOccupancyField.ts
index 931b426d..f7332d46 100644
--- a/database/deleteLotOccupancyField.ts
+++ b/database/deleteLotOccupancyField.ts
@@ -2,7 +2,7 @@ import type { PoolConnection } from 'better-sqlite-pool'
 
 import { acquireConnection } from './pool.js'
 
-export async function deleteLotOccupancyField(
+export default async function deleteLotOccupancyField(
   lotOccupancyId: number | string,
   occupancyTypeFieldId: number | string,
   user: User,
@@ -18,12 +18,7 @@ export async function deleteLotOccupancyField(
         where lotOccupancyId = ?
         and occupancyTypeFieldId = ?`
     )
-    .run(
-      user.userName,
-      Date.now(),
-      lotOccupancyId,
-      occupancyTypeFieldId
-    )
+    .run(user.userName, Date.now(), lotOccupancyId, occupancyTypeFieldId)
 
   if (connectedDatabase === undefined) {
     database.release()
@@ -31,5 +26,3 @@ export async function deleteLotOccupancyField(
 
   return result.changes > 0
 }
-
-export default deleteLotOccupancyField
diff --git a/database/deleteLotOccupancyOccupant.d.ts b/database/deleteLotOccupancyOccupant.d.ts
index de96a640..8f7d456e 100644
--- a/database/deleteLotOccupancyOccupant.d.ts
+++ b/database/deleteLotOccupancyOccupant.d.ts
@@ -1,2 +1 @@
-export declare function deleteLotOccupancyOccupant(lotOccupancyId: number | string, lotOccupantIndex: number | string, user: User): Promise<boolean>;
-export default deleteLotOccupancyOccupant;
+export default function deleteLotOccupancyOccupant(lotOccupancyId: number | string, lotOccupantIndex: number | string, user: User): Promise<boolean>;
diff --git a/database/deleteLotOccupancyOccupant.js b/database/deleteLotOccupancyOccupant.js
index f86c21c1..59965934 100644
--- a/database/deleteLotOccupancyOccupant.js
+++ b/database/deleteLotOccupancyOccupant.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteLotOccupancyOccupant(lotOccupancyId, lotOccupantIndex, user) {
+export default async function deleteLotOccupancyOccupant(lotOccupancyId, lotOccupantIndex, user) {
     const database = await acquireConnection();
     const result = database
         .prepare(`update LotOccupancyOccupants
@@ -11,4 +11,3 @@ export async function deleteLotOccupancyOccupant(lotOccupancyId, lotOccupantInde
     database.release();
     return result.changes > 0;
 }
-export default deleteLotOccupancyOccupant;
diff --git a/database/deleteLotOccupancyOccupant.ts b/database/deleteLotOccupancyOccupant.ts
index ad581579..1e37eaf6 100644
--- a/database/deleteLotOccupancyOccupant.ts
+++ b/database/deleteLotOccupancyOccupant.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-export async function deleteLotOccupancyOccupant(
+export default async function deleteLotOccupancyOccupant(
   lotOccupancyId: number | string,
   lotOccupantIndex: number | string,
   user: User
@@ -21,5 +21,3 @@ export async function deleteLotOccupancyOccupant(
 
   return result.changes > 0
 }
-
-export default deleteLotOccupancyOccupant
diff --git a/database/deleteLotOccupancyTransaction.d.ts b/database/deleteLotOccupancyTransaction.d.ts
index 577a743e..38324ddc 100644
--- a/database/deleteLotOccupancyTransaction.d.ts
+++ b/database/deleteLotOccupancyTransaction.d.ts
@@ -1,2 +1 @@
-export declare function deleteLotOccupancyTransaction(lotOccupancyId: number | string, transactionIndex: number | string, user: User): Promise<boolean>;
-export default deleteLotOccupancyTransaction;
+export default function deleteLotOccupancyTransaction(lotOccupancyId: number | string, transactionIndex: number | string, user: User): Promise<boolean>;
diff --git a/database/deleteLotOccupancyTransaction.js b/database/deleteLotOccupancyTransaction.js
index 143e7a2b..0a7bb9e4 100644
--- a/database/deleteLotOccupancyTransaction.js
+++ b/database/deleteLotOccupancyTransaction.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteLotOccupancyTransaction(lotOccupancyId, transactionIndex, user) {
+export default async function deleteLotOccupancyTransaction(lotOccupancyId, transactionIndex, user) {
     const database = await acquireConnection();
     const result = database
         .prepare(`update LotOccupancyTransactions
@@ -11,4 +11,3 @@ export async function deleteLotOccupancyTransaction(lotOccupancyId, transactionI
     database.release();
     return result.changes > 0;
 }
-export default deleteLotOccupancyTransaction;
diff --git a/database/deleteLotOccupancyTransaction.ts b/database/deleteLotOccupancyTransaction.ts
index 43df8d40..6301265c 100644
--- a/database/deleteLotOccupancyTransaction.ts
+++ b/database/deleteLotOccupancyTransaction.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-export async function deleteLotOccupancyTransaction(
+export default async function deleteLotOccupancyTransaction(
   lotOccupancyId: number | string,
   transactionIndex: number | string,
   user: User
@@ -21,5 +21,3 @@ export async function deleteLotOccupancyTransaction(
 
   return result.changes > 0
 }
-
-export default deleteLotOccupancyTransaction
diff --git a/database/deleteOccupancyTypePrint.d.ts b/database/deleteOccupancyTypePrint.d.ts
index 377cb5e8..64ce0a3b 100644
--- a/database/deleteOccupancyTypePrint.d.ts
+++ b/database/deleteOccupancyTypePrint.d.ts
@@ -1,2 +1 @@
-export declare function deleteOccupancyTypePrint(occupancyTypeId: number | string, printEJS: string, user: User): Promise<boolean>;
-export default deleteOccupancyTypePrint;
+export default function deleteOccupancyTypePrint(occupancyTypeId: number | string, printEJS: string, user: User): Promise<boolean>;
diff --git a/database/deleteOccupancyTypePrint.js b/database/deleteOccupancyTypePrint.js
index 476cd3ae..dc436560 100644
--- a/database/deleteOccupancyTypePrint.js
+++ b/database/deleteOccupancyTypePrint.js
@@ -1,6 +1,6 @@
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
 import { acquireConnection } from './pool.js';
-export async function deleteOccupancyTypePrint(occupancyTypeId, printEJS, user) {
+export default async function deleteOccupancyTypePrint(occupancyTypeId, printEJS, user) {
     const database = await acquireConnection();
     const result = database
         .prepare(`update OccupancyTypePrints
@@ -13,4 +13,3 @@ export async function deleteOccupancyTypePrint(occupancyTypeId, printEJS, user)
     clearCacheByTableName('OccupancyTypePrints');
     return result.changes > 0;
 }
-export default deleteOccupancyTypePrint;
diff --git a/database/deleteOccupancyTypePrint.ts b/database/deleteOccupancyTypePrint.ts
index 7f865f73..087a9e11 100644
--- a/database/deleteOccupancyTypePrint.ts
+++ b/database/deleteOccupancyTypePrint.ts
@@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 import { acquireConnection } from './pool.js'
 
-export async function deleteOccupancyTypePrint(
+export default async function deleteOccupancyTypePrint(
   occupancyTypeId: number | string,
   printEJS: string,
   user: User
@@ -25,5 +25,3 @@ export async function deleteOccupancyTypePrint(
 
   return result.changes > 0
 }
-
-export default deleteOccupancyTypePrint
diff --git a/database/deleteWorkOrderLot.d.ts b/database/deleteWorkOrderLot.d.ts
index 209e96bd..7da5b373 100644
--- a/database/deleteWorkOrderLot.d.ts
+++ b/database/deleteWorkOrderLot.d.ts
@@ -1,2 +1 @@
-export declare function deleteWorkOrderLot(workOrderId: number | string, lotId: number | string, user: User): Promise<boolean>;
-export default deleteWorkOrderLot;
+export default function deleteWorkOrderLot(workOrderId: number | string, lotId: number | string, user: User): Promise<boolean>;
diff --git a/database/deleteWorkOrderLot.js b/database/deleteWorkOrderLot.js
index 5df271b4..9f8b16cf 100644
--- a/database/deleteWorkOrderLot.js
+++ b/database/deleteWorkOrderLot.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteWorkOrderLot(workOrderId, lotId, user) {
+export default async function deleteWorkOrderLot(workOrderId, lotId, user) {
     const database = await acquireConnection();
     const result = database
         .prepare(`update WorkOrderLots
@@ -11,4 +11,3 @@ export async function deleteWorkOrderLot(workOrderId, lotId, user) {
     database.release();
     return result.changes > 0;
 }
-export default deleteWorkOrderLot;
diff --git a/database/deleteWorkOrderLot.ts b/database/deleteWorkOrderLot.ts
index 0d3e011b..827f7162 100644
--- a/database/deleteWorkOrderLot.ts
+++ b/database/deleteWorkOrderLot.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-export async function deleteWorkOrderLot(
+export default async function deleteWorkOrderLot(
   workOrderId: number | string,
   lotId: number | string,
   user: User
@@ -21,5 +21,3 @@ export async function deleteWorkOrderLot(
 
   return result.changes > 0
 }
-
-export default deleteWorkOrderLot
diff --git a/database/deleteWorkOrderLotOccupancy.d.ts b/database/deleteWorkOrderLotOccupancy.d.ts
index e64ac4d0..c253668d 100644
--- a/database/deleteWorkOrderLotOccupancy.d.ts
+++ b/database/deleteWorkOrderLotOccupancy.d.ts
@@ -1,2 +1 @@
-export declare function deleteWorkOrderLotOccupancy(workOrderId: number | string, lotOccupancyId: number | string, user: User): Promise<boolean>;
-export default deleteWorkOrderLotOccupancy;
+export default function deleteWorkOrderLotOccupancy(workOrderId: number | string, lotOccupancyId: number | string, user: User): Promise<boolean>;
diff --git a/database/deleteWorkOrderLotOccupancy.js b/database/deleteWorkOrderLotOccupancy.js
index ef24ad81..c877c2c3 100644
--- a/database/deleteWorkOrderLotOccupancy.js
+++ b/database/deleteWorkOrderLotOccupancy.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function deleteWorkOrderLotOccupancy(workOrderId, lotOccupancyId, user) {
+export default async function deleteWorkOrderLotOccupancy(workOrderId, lotOccupancyId, user) {
     const database = await acquireConnection();
     const result = database
         .prepare(`update WorkOrderLotOccupancies
@@ -11,4 +11,3 @@ export async function deleteWorkOrderLotOccupancy(workOrderId, lotOccupancyId, u
     database.release();
     return result.changes > 0;
 }
-export default deleteWorkOrderLotOccupancy;
diff --git a/database/deleteWorkOrderLotOccupancy.ts b/database/deleteWorkOrderLotOccupancy.ts
index a9386920..82be9e0f 100644
--- a/database/deleteWorkOrderLotOccupancy.ts
+++ b/database/deleteWorkOrderLotOccupancy.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-export async function deleteWorkOrderLotOccupancy(
+export default async function deleteWorkOrderLotOccupancy(
   workOrderId: number | string,
   lotOccupancyId: number | string,
   user: User
@@ -21,5 +21,3 @@ export async function deleteWorkOrderLotOccupancy(
 
   return result.changes > 0
 }
-
-export default deleteWorkOrderLotOccupancy
diff --git a/database/updateLot.js b/database/updateLot.js
index 4b92d169..05ce15df 100644
--- a/database/updateLot.js
+++ b/database/updateLot.js
@@ -1,5 +1,5 @@
 import addOrUpdateLotField from './addOrUpdateLotField.js';
-import { deleteLotField } from './deleteLotField.js';
+import deleteLotField from './deleteLotField.js';
 import { acquireConnection } from './pool.js';
 export async function updateLot(lotForm, user) {
     const database = await acquireConnection();
diff --git a/database/updateLot.ts b/database/updateLot.ts
index 1aacfb73..02d79539 100644
--- a/database/updateLot.ts
+++ b/database/updateLot.ts
@@ -1,5 +1,5 @@
 import addOrUpdateLotField from './addOrUpdateLotField.js'
-import { deleteLotField } from './deleteLotField.js'
+import deleteLotField from './deleteLotField.js'
 import { acquireConnection } from './pool.js'
 
 interface UpdateLotForm {
diff --git a/database/updateLotOccupancy.js b/database/updateLotOccupancy.js
index 56cb6b69..9e4a0d57 100644
--- a/database/updateLotOccupancy.js
+++ b/database/updateLotOccupancy.js
@@ -1,6 +1,6 @@
 import { dateStringToInteger } from '@cityssm/utils-datetime';
 import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js';
-import { deleteLotOccupancyField } from './deleteLotOccupancyField.js';
+import deleteLotOccupancyField from './deleteLotOccupancyField.js';
 import { acquireConnection } from './pool.js';
 export async function updateLotOccupancy(lotOccupancyForm, user) {
     const database = await acquireConnection();
diff --git a/database/updateLotOccupancy.ts b/database/updateLotOccupancy.ts
index 85459c6c..68b14b6f 100644
--- a/database/updateLotOccupancy.ts
+++ b/database/updateLotOccupancy.ts
@@ -1,7 +1,7 @@
 import { dateStringToInteger } from '@cityssm/utils-datetime'
 
 import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js'
-import { deleteLotOccupancyField } from './deleteLotOccupancyField.js'
+import deleteLotOccupancyField from './deleteLotOccupancyField.js'
 import { acquireConnection } from './pool.js'
 
 interface UpdateLotOccupancyForm {
diff --git a/handlers/admin-post/doDeleteFee.ts b/handlers/admin-post/doDeleteFee.ts
index 6d43139a..7e391c8f 100644
--- a/handlers/admin-post/doDeleteFee.ts
+++ b/handlers/admin-post/doDeleteFee.ts
@@ -7,7 +7,11 @@ export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const success = await deleteRecord('Fees', request.body.feeId, request.session.user as User)
+  const success = await deleteRecord(
+    'Fees',
+    request.body.feeId as string,
+    request.session.user as User
+  )
 
   const feeCategories = await getFeeCategories(
     {},
diff --git a/handlers/admin-post/doDeleteFeeCategory.ts b/handlers/admin-post/doDeleteFeeCategory.ts
index a99e7f89..906af636 100644
--- a/handlers/admin-post/doDeleteFeeCategory.ts
+++ b/handlers/admin-post/doDeleteFeeCategory.ts
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'FeeCategories',
-    request.body.feeCategoryId,
+    request.body.feeCategoryId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteLotOccupantType.js b/handlers/admin-post/doDeleteLotOccupantType.js
index 695ba655..a9fcdade 100644
--- a/handlers/admin-post/doDeleteLotOccupantType.js
+++ b/handlers/admin-post/doDeleteLotOccupantType.js
@@ -1,5 +1,5 @@
-import { getLotOccupantTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getLotOccupantTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('LotOccupantTypes', request.body.lotOccupantTypeId, request.session.user);
     const lotOccupantTypes = await getLotOccupantTypes();
diff --git a/handlers/admin-post/doDeleteLotOccupantType.ts b/handlers/admin-post/doDeleteLotOccupantType.ts
index c5ce4f1a..5c778ca1 100644
--- a/handlers/admin-post/doDeleteLotOccupantType.ts
+++ b/handlers/admin-post/doDeleteLotOccupantType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getLotOccupantTypes } from '../../helpers/functions.cache.js'
 import { deleteRecord } from '../../database/deleteRecord.js'
+import { getLotOccupantTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'LotOccupantTypes',
-    request.body.lotOccupantTypeId,
+    request.body.lotOccupantTypeId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteLotStatus.js b/handlers/admin-post/doDeleteLotStatus.js
index 797d6d98..e7681893 100644
--- a/handlers/admin-post/doDeleteLotStatus.js
+++ b/handlers/admin-post/doDeleteLotStatus.js
@@ -1,5 +1,5 @@
-import { getLotStatuses } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getLotStatuses } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('LotStatuses', request.body.lotStatusId, request.session.user);
     const lotStatuses = await getLotStatuses();
diff --git a/handlers/admin-post/doDeleteLotStatus.ts b/handlers/admin-post/doDeleteLotStatus.ts
index 41ec8d29..902d3cd7 100644
--- a/handlers/admin-post/doDeleteLotStatus.ts
+++ b/handlers/admin-post/doDeleteLotStatus.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getLotStatuses } from '../../helpers/functions.cache.js'
 import { deleteRecord } from '../../database/deleteRecord.js'
+import { getLotStatuses } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'LotStatuses',
-    request.body.lotStatusId,
+    request.body.lotStatusId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteLotType.js b/handlers/admin-post/doDeleteLotType.js
index fe33a32d..33eab0fe 100644
--- a/handlers/admin-post/doDeleteLotType.js
+++ b/handlers/admin-post/doDeleteLotType.js
@@ -1,5 +1,5 @@
-import { getLotTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getLotTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('LotTypes', request.body.lotTypeId, request.session.user);
     const lotTypes = await getLotTypes();
diff --git a/handlers/admin-post/doDeleteLotType.ts b/handlers/admin-post/doDeleteLotType.ts
index 5657792f..1b81fc48 100644
--- a/handlers/admin-post/doDeleteLotType.ts
+++ b/handlers/admin-post/doDeleteLotType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getLotTypes } from '../../helpers/functions.cache.js'
 import { deleteRecord } from '../../database/deleteRecord.js'
+import { getLotTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'LotTypes',
-    request.body.lotTypeId,
+    request.body.lotTypeId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteLotTypeField.js b/handlers/admin-post/doDeleteLotTypeField.js
index 27e1c146..e0135032 100644
--- a/handlers/admin-post/doDeleteLotTypeField.js
+++ b/handlers/admin-post/doDeleteLotTypeField.js
@@ -1,5 +1,5 @@
-import { getLotTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getLotTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('LotTypeFields', request.body.lotTypeFieldId, request.session.user);
     const lotTypes = await getLotTypes();
diff --git a/handlers/admin-post/doDeleteLotTypeField.ts b/handlers/admin-post/doDeleteLotTypeField.ts
index 431c15d0..40833790 100644
--- a/handlers/admin-post/doDeleteLotTypeField.ts
+++ b/handlers/admin-post/doDeleteLotTypeField.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getLotTypes } from '../../helpers/functions.cache.js'
 import { deleteRecord } from '../../database/deleteRecord.js'
+import { getLotTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'LotTypeFields',
-    request.body.lotTypeFieldId,
+    request.body.lotTypeFieldId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteOccupancyType.js b/handlers/admin-post/doDeleteOccupancyType.js
index 7054a031..d17bd08a 100644
--- a/handlers/admin-post/doDeleteOccupancyType.js
+++ b/handlers/admin-post/doDeleteOccupancyType.js
@@ -1,5 +1,5 @@
-import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('OccupancyTypes', request.body.occupancyTypeId, request.session.user);
     const occupancyTypes = await getOccupancyTypes();
diff --git a/handlers/admin-post/doDeleteOccupancyType.ts b/handlers/admin-post/doDeleteOccupancyType.ts
index f359523d..c9b29f06 100644
--- a/handlers/admin-post/doDeleteOccupancyType.ts
+++ b/handlers/admin-post/doDeleteOccupancyType.ts
@@ -1,10 +1,10 @@
 import type { Request, Response } from 'express'
 
+import { deleteRecord } from '../../database/deleteRecord.js'
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-import { deleteRecord } from '../../database/deleteRecord.js'
 
 export async function handler(
   request: Request,
@@ -12,7 +12,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'OccupancyTypes',
-    request.body.occupancyTypeId,
+    request.body.occupancyTypeId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteOccupancyTypeField.js b/handlers/admin-post/doDeleteOccupancyTypeField.js
index aba43698..3a37c903 100644
--- a/handlers/admin-post/doDeleteOccupancyTypeField.js
+++ b/handlers/admin-post/doDeleteOccupancyTypeField.js
@@ -1,5 +1,5 @@
-import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('OccupancyTypeFields', request.body.occupancyTypeFieldId, request.session.user);
     const occupancyTypes = await getOccupancyTypes();
diff --git a/handlers/admin-post/doDeleteOccupancyTypeField.ts b/handlers/admin-post/doDeleteOccupancyTypeField.ts
index 75ccac01..91c27c4b 100644
--- a/handlers/admin-post/doDeleteOccupancyTypeField.ts
+++ b/handlers/admin-post/doDeleteOccupancyTypeField.ts
@@ -1,10 +1,10 @@
 import type { Request, Response } from 'express'
 
+import { deleteRecord } from '../../database/deleteRecord.js'
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-import { deleteRecord } from '../../database/deleteRecord.js'
 
 export async function handler(
   request: Request,
@@ -12,7 +12,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'OccupancyTypeFields',
-    request.body.occupancyTypeFieldId,
+    request.body.occupancyTypeFieldId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteOccupancyTypePrint.js b/handlers/admin-post/doDeleteOccupancyTypePrint.js
index 688518ce..115c4f02 100644
--- a/handlers/admin-post/doDeleteOccupancyTypePrint.js
+++ b/handlers/admin-post/doDeleteOccupancyTypePrint.js
@@ -1,5 +1,5 @@
+import deleteOccupancyTypePrint from '../../database/deleteOccupancyTypePrint.js';
 import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
-import { deleteOccupancyTypePrint } from '../../database/deleteOccupancyTypePrint.js';
 export async function handler(request, response) {
     const success = await deleteOccupancyTypePrint(request.body.occupancyTypeId, request.body.printEJS, request.session.user);
     const occupancyTypes = await getOccupancyTypes();
diff --git a/handlers/admin-post/doDeleteOccupancyTypePrint.ts b/handlers/admin-post/doDeleteOccupancyTypePrint.ts
index a36e5e4c..6d112358 100644
--- a/handlers/admin-post/doDeleteOccupancyTypePrint.ts
+++ b/handlers/admin-post/doDeleteOccupancyTypePrint.ts
@@ -1,18 +1,18 @@
 import type { Request, Response } from 'express'
 
+import deleteOccupancyTypePrint from '../../database/deleteOccupancyTypePrint.js'
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-import { deleteOccupancyTypePrint } from '../../database/deleteOccupancyTypePrint.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const success = await deleteOccupancyTypePrint(
-    request.body.occupancyTypeId,
-    request.body.printEJS,
+    request.body.occupancyTypeId as string,
+    request.body.printEJS as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.js b/handlers/admin-post/doDeleteWorkOrderMilestoneType.js
index c2a00567..54e2beda 100644
--- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.js
+++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.js
@@ -1,5 +1,5 @@
-import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.session.user);
     const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes();
diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts b/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts
index 129963e5..7105c09f 100644
--- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts
+++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'
 import { deleteRecord } from '../../database/deleteRecord.js'
+import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'WorkOrderMilestoneTypes',
-    request.body.workOrderMilestoneTypeId,
+    request.body.workOrderMilestoneTypeId as string,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doDeleteWorkOrderType.js b/handlers/admin-post/doDeleteWorkOrderType.js
index f1f7b78b..70115bc3 100644
--- a/handlers/admin-post/doDeleteWorkOrderType.js
+++ b/handlers/admin-post/doDeleteWorkOrderType.js
@@ -1,5 +1,5 @@
-import { getWorkOrderTypes } from '../../helpers/functions.cache.js';
 import { deleteRecord } from '../../database/deleteRecord.js';
+import { getWorkOrderTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const success = await deleteRecord('WorkOrderTypes', request.body.workOrderTypeId, request.session.user);
     const workOrderTypes = await getWorkOrderTypes();
diff --git a/handlers/admin-post/doDeleteWorkOrderType.ts b/handlers/admin-post/doDeleteWorkOrderType.ts
index 2991dfb5..7ce41065 100644
--- a/handlers/admin-post/doDeleteWorkOrderType.ts
+++ b/handlers/admin-post/doDeleteWorkOrderType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getWorkOrderTypes } from '../../helpers/functions.cache.js'
 import { deleteRecord } from '../../database/deleteRecord.js'
+import { getWorkOrderTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
@@ -9,7 +9,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'WorkOrderTypes',
-    request.body.workOrderTypeId,
+    request.body.workOrderTypeId as string,
     request.session.user as User
   )
 
diff --git a/handlers/lotOccupancies-get/edit.ts b/handlers/lotOccupancies-get/edit.ts
index 9545c4fc..7f562843 100644
--- a/handlers/lotOccupancies-get/edit.ts
+++ b/handlers/lotOccupancies-get/edit.ts
@@ -25,7 +25,7 @@ export async function handler(request: Request, response: Response): Promise<voi
   }
 
   const occupancyTypePrints = await getOccupancyTypePrintsById(
-    lotOccupancy.occupancyTypeId!
+    lotOccupancy.occupancyTypeId
   )
 
   const occupancyTypes = await getOccupancyTypes()
diff --git a/handlers/lotOccupancies-get/view.ts b/handlers/lotOccupancies-get/view.ts
index 4e6a00d9..7d5327ba 100644
--- a/handlers/lotOccupancies-get/view.ts
+++ b/handlers/lotOccupancies-get/view.ts
@@ -20,7 +20,7 @@ export async function handler(
   }
 
   const occupancyTypePrints = await getOccupancyTypePrintsById(
-    lotOccupancy.occupancyTypeId!
+    lotOccupancy.occupancyTypeId
   )
 
   response.render('lotOccupancy-view', {
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancy.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancy.ts
index a5b49a29..a32c003b 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancy.ts
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancy.ts
@@ -8,7 +8,7 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'LotOccupancies',
-    request.body.lotOccupancyId,
+    request.body.lotOccupancyId as string,
     request.session.user as User
   )
 
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts
index 8a22d58c..921baaf7 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts
@@ -9,12 +9,12 @@ export async function handler(
 ): Promise<void> {
   const success = await deleteRecord(
     'LotOccupancyComments',
-    request.body.lotOccupancyCommentId,
+    request.body.lotOccupancyCommentId as string,
     request.session.user as User
   )
 
   const lotOccupancyComments = await getLotOccupancyComments(
-    request.body.lotOccupancyId
+    request.body.lotOccupancyId as string
   )
 
   response.json({
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js
index eebc98b7..13ad8a63 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js
@@ -1,4 +1,4 @@
-import { deleteLotOccupancyFee } from '../../database/deleteLotOccupancyFee.js';
+import deleteLotOccupancyFee from '../../database/deleteLotOccupancyFee.js';
 import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js';
 export async function handler(request, response) {
     const success = await deleteLotOccupancyFee(request.body.lotOccupancyId, request.body.feeId, request.session.user);
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts
index 4ec06420..ddaabf0d 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { deleteLotOccupancyFee } from '../../database/deleteLotOccupancyFee.js'
+import deleteLotOccupancyFee from '../../database/deleteLotOccupancyFee.js'
 import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js'
 
 export async function handler(
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js
index 06022355..67fcee5b 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js
@@ -1,4 +1,4 @@
-import { deleteLotOccupancyOccupant } from '../../database/deleteLotOccupancyOccupant.js';
+import deleteLotOccupancyOccupant from '../../database/deleteLotOccupancyOccupant.js';
 import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js';
 export async function handler(request, response) {
     const success = await deleteLotOccupancyOccupant(request.body.lotOccupancyId, request.body.lotOccupantIndex, request.session.user);
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts
index cec0cce0..a54db41a 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { deleteLotOccupancyOccupant } from '../../database/deleteLotOccupancyOccupant.js'
+import deleteLotOccupancyOccupant from '../../database/deleteLotOccupancyOccupant.js'
 import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js'
 
 export async function handler(
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js
index f0d6a1a0..e9a299d8 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js
@@ -1,4 +1,4 @@
-import { deleteLotOccupancyTransaction } from '../../database/deleteLotOccupancyTransaction.js';
+import deleteLotOccupancyTransaction from '../../database/deleteLotOccupancyTransaction.js';
 import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js';
 export async function handler(request, response) {
     const success = await deleteLotOccupancyTransaction(request.body.lotOccupancyId, request.body.transactionIndex, request.session.user);
diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts
index 5243ec84..211654a2 100644
--- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts
+++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { deleteLotOccupancyTransaction } from '../../database/deleteLotOccupancyTransaction.js'
+import deleteLotOccupancyTransaction from '../../database/deleteLotOccupancyTransaction.js'
 import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js'
 
 export async function handler(
diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.js b/handlers/workOrders-post/doDeleteWorkOrderLot.js
index 624382e5..b55af6cb 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderLot.js
+++ b/handlers/workOrders-post/doDeleteWorkOrderLot.js
@@ -1,4 +1,4 @@
-import { deleteWorkOrderLot } from '../../database/deleteWorkOrderLot.js';
+import deleteWorkOrderLot from '../../database/deleteWorkOrderLot.js';
 import { getLots } from '../../database/getLots.js';
 export async function handler(request, response) {
     const success = await deleteWorkOrderLot(request.body.workOrderId, request.body.lotId, request.session.user);
diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.ts b/handlers/workOrders-post/doDeleteWorkOrderLot.ts
index d119dd50..277545dc 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderLot.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderLot.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { deleteWorkOrderLot } from '../../database/deleteWorkOrderLot.js'
+import deleteWorkOrderLot from '../../database/deleteWorkOrderLot.js'
 import { getLots } from '../../database/getLots.js'
 
 export async function handler(
diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js
index 138dbd1a..c041822a 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js
+++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js
@@ -1,4 +1,4 @@
-import { deleteWorkOrderLotOccupancy } from '../../database/deleteWorkOrderLotOccupancy.js';
+import deleteWorkOrderLotOccupancy from '../../database/deleteWorkOrderLotOccupancy.js';
 import { getLotOccupancies } from '../../database/getLotOccupancies.js';
 export async function handler(request, response) {
     const success = await deleteWorkOrderLotOccupancy(request.body.workOrderId, request.body.lotOccupancyId, request.session.user);
diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts
index abe045b3..ea410955 100644
--- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts
+++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts
@@ -1,9 +1,12 @@
 import type { Request, Response } from 'express'
 
-import { deleteWorkOrderLotOccupancy } from '../../database/deleteWorkOrderLotOccupancy.js'
+import deleteWorkOrderLotOccupancy from '../../database/deleteWorkOrderLotOccupancy.js'
 import { getLotOccupancies } from '../../database/getLotOccupancies.js'
 
-export async function handler(request: Request, response: Response): Promise<void> {
+export async function handler(
+  request: Request,
+  response: Response
+): Promise<void> {
   const success = await deleteWorkOrderLotOccupancy(
     request.body.workOrderId,
     request.body.lotOccupancyId,
diff --git a/types/recordTypes.d.ts b/types/recordTypes.d.ts
index 2c164be5..315ad57f 100644
--- a/types/recordTypes.d.ts
+++ b/types/recordTypes.d.ts
@@ -193,7 +193,7 @@ export interface LotOccupancyField extends OccupancyTypeField, Record {
 }
 export interface LotOccupancy extends Record {
     lotOccupancyId: number;
-    occupancyTypeId?: number;
+    occupancyTypeId: number;
     occupancyType?: string;
     printEJS?: string;
     lotId?: number;
diff --git a/types/recordTypes.ts b/types/recordTypes.ts
index 083e280b..e0b43622 100644
--- a/types/recordTypes.ts
+++ b/types/recordTypes.ts
@@ -253,7 +253,7 @@ export interface LotOccupancyField extends OccupancyTypeField, Record {
 export interface LotOccupancy extends Record {
   lotOccupancyId: number
 
-  occupancyTypeId?: number
+  occupancyTypeId: number
   occupancyType?: string
   printEJS?: string