diff --git a/lib/extension/availability.ts b/lib/extension/availability.ts
index df19e91e3..8cbebe060 100644
--- a/lib/extension/availability.ts
+++ b/lib/extension/availability.ts
@@ -215,7 +215,7 @@ export default class Availability extends Extension {
                     const options: KeyValue = device.options;
                     const state = this.state.get(device);
                     const meta: zhc.Tz.Meta = {
-                        message: this.state.get(device), mapped: device.definition, logger, endpoint_name: null,
+                        message: this.state.get(device), mapped: device.definition, endpoint_name: null,
                         options, state, device: device.zh,
                     };
                     await converter?.convertGet?.(device.endpoint(), item.keys[0], meta)
diff --git a/lib/extension/configure.ts b/lib/extension/configure.ts
index 3178f5c9c..0db4d75ab 100644
--- a/lib/extension/configure.ts
+++ b/lib/extension/configure.ts
@@ -119,7 +119,7 @@ export default class Configure extends Extension {
 
         logger.info(`Configuring '${device.name}'`);
         try {
-            await device.definition.configure(device.zh, this.zigbee.firstCoordinatorEndpoint(), logger);
+            await device.definition.configure(device.zh, this.zigbee.firstCoordinatorEndpoint());
             logger.info(`Successfully configured '${device.name}'`);
             device.zh.meta.configured = zhc.getConfigureKey(device.definition);
             device.zh.save();
diff --git a/lib/extension/otaUpdate.ts b/lib/extension/otaUpdate.ts
index 7db198b7f..d74c36480 100644
--- a/lib/extension/otaUpdate.ts
+++ b/lib/extension/otaUpdate.ts
@@ -98,7 +98,7 @@ export default class OTAUpdate extends Extension {
             try {
                 // @ts-expect-error typing guaranteed by data.type
                 const dataData: zhc.ota.ImageInfo = data.data;
-                availableResult = await data.device.definition.ota.isUpdateAvailable(data.device.zh, logger, dataData);
+                availableResult = await data.device.definition.ota.isUpdateAvailable(data.device.zh, dataData);
             } catch (e) {
                 supportsOTA = false;
                 logger.debug(`Failed to check if update available for '${data.device.name}' (${e.message})`);
@@ -206,7 +206,7 @@ export default class OTAUpdate extends Extension {
                 }
 
                 try {
-                    const availableResult = await device.definition.ota.isUpdateAvailable(device.zh, logger, null);
+                    const availableResult = await device.definition.ota.isUpdateAvailable(device.zh, null);
                     const msg = `${availableResult.available ? 'Update' : 'No update'} available for '${device.name}'`;
                     logger.info(msg);
 
@@ -270,7 +270,7 @@ export default class OTAUpdate extends Extension {
                     };
 
                     const from_ = await this.readSoftwareBuildIDAndDateCode(device, 'immediate');
-                    const fileVersion = await device.definition.ota.updateToLatest(device.zh, logger, onProgress);
+                    const fileVersion = await device.definition.ota.updateToLatest(device.zh, onProgress);
                     logger.info(`Finished update of '${device.name}'`);
                     this.eventBus.emitReconfigure({device});
                     this.removeProgressAndRemainingFromState(device);