diff --git a/src/services/guildService.ts b/src/services/guildService.ts
index 5aa7aa77..753d366d 100644
--- a/src/services/guildService.ts
+++ b/src/services/guildService.ts
@@ -134,7 +134,7 @@ export const getGuildVault = (guild: TGuildDatabaseDocument): IGuildVault => {
 export const getDojoClient = async (
     guild: TGuildDatabaseDocument,
     status: number,
-    componentId: Types.ObjectId | string | undefined = undefined
+    componentId?: Types.ObjectId | string
 ): Promise<IDojoClient> => {
     const dojo: IDojoClient = {
         _id: { $oid: guild._id.toString() },
@@ -554,7 +554,7 @@ export const setGuildTechLogState = (
     guild: TGuildDatabaseDocument,
     type: string,
     state: number,
-    dateTime: Date | undefined = undefined
+    dateTime?: Date
 ): boolean => {
     guild.TechChanges ??= [];
     const entry = guild.TechChanges.find(x => x.details == type);
diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts
index 9d1bf0ed..31abb4ef 100644
--- a/src/services/inventoryService.ts
+++ b/src/services/inventoryService.ts
@@ -143,7 +143,7 @@ const awakeningRewards = [
 
 export const addStartingGear = async (
     inventory: TInventoryDatabaseDocument,
-    startingGear: TPartialStartingGear | undefined = undefined
+    startingGear?: TPartialStartingGear
 ): Promise<IInventoryChanges> => {
     const { LongGuns, Pistols, Suits, Melee } = startingGear || {
         LongGuns: [{ ItemType: "/Lotus/Weapons/Tenno/Rifle/Rifle" }],
@@ -245,7 +245,7 @@ export const combineInventoryChanges = (InventoryChanges: IInventoryChanges, del
 
 export const getInventory = async (
     accountOwnerId: string,
-    projection: string | undefined = undefined
+    projection?: string
 ): Promise<TInventoryDatabaseDocument> => {
     const inventory = await Inventory.findOne({ accountOwnerId: accountOwnerId }, projection);
 
@@ -856,7 +856,7 @@ export const addPowerSuit = async (
     inventory: TInventoryDatabaseDocument,
     powersuitName: string,
     inventoryChanges: IInventoryChanges = {},
-    features: number | undefined = undefined
+    features?: number
 ): Promise<IInventoryChanges> => {
     const powersuit = ExportWarframes[powersuitName] as IPowersuit | undefined;
     const exalted = powersuit?.exalted ?? [];
@@ -888,7 +888,7 @@ export const addMechSuit = async (
     inventory: TInventoryDatabaseDocument,
     mechsuitName: string,
     inventoryChanges: IInventoryChanges = {},
-    features: number | undefined = undefined
+    features?: number
 ): Promise<IInventoryChanges> => {
     const powersuit = ExportWarframes[mechsuitName] as IPowersuit | undefined;
     const exalted = powersuit?.exalted ?? [];
@@ -940,7 +940,7 @@ export const addSpaceSuit = (
     inventory: TInventoryDatabaseDocument,
     spacesuitName: string,
     inventoryChanges: IInventoryChanges = {},
-    features: number | undefined = undefined
+    features?: number
 ): IInventoryChanges => {
     const suitIndex =
         inventory.SpaceSuits.push({
@@ -1199,9 +1199,9 @@ export const addEquipment = (
     inventory: TInventoryDatabaseDocument,
     category: TEquipmentKey,
     type: string,
-    modularParts: string[] | undefined = undefined,
+    modularParts?: string[],
     inventoryChanges: IInventoryChanges = {},
-    defaultOverwrites: Partial<IEquipmentDatabase> | undefined = undefined
+    defaultOverwrites?: Partial<IEquipmentDatabase>
 ): IInventoryChanges => {
     const equipment = Object.assign(
         {