diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index f6e2bab88..847daee10 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -184,7 +184,8 @@ export function useMessageReactsPropsById(messageId?: string) {
   });
 }
 
-// TODO remove 10 seconds timer
+// TODO use env variable to toggle test values?
+// https://github.com/oxen-io/session-desktop/pull/2660/files#r1174823750
 export function useTimerOptionsByMode(disappearingMessageMode?: string, hasOnlyOneMode?: boolean) {
   return useSelector((state: StateType) => {
     const options = state.timerOptions.timerOptions;
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index eaf88607a..386142551 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -678,10 +678,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
           expireTimer: chatMessageParams.expireTimer,
         });
 
-        window.log.info(
-          'WIP: sendMessageJob() closedGroupVisibleMessage',
-          closedGroupVisibleMessage
-        );
+        window.log.debug('sendMessageJob() closedGroupVisibleMessage', closedGroupVisibleMessage);
 
         // we need the return await so that errors are caught in the catch {}
         await getMessageQueue().sendToGroup(closedGroupVisibleMessage);
@@ -1075,9 +1072,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     existingMessage?: MessageModel;
   }): Promise<void> {
     if (this.isPublic()) {
-      window.log.warning(
-        "WIP: updateExpireTimer() Disappearing messages aren't supported in communities"
-      );
+      window.log.warn("updateExpireTimer() Disappearing messages aren't supported in communities");
       return;
     }
 
@@ -1094,7 +1089,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (
       this.get('lastDisappearingMessageChangeTimestamp') > lastDisappearingMessageChangeTimestamp
     ) {
-      window.log.info('WIP: updateExpireTimer() This is an outdated disappearing message setting');
+      window.log.info('updateExpireTimer() This is an outdated disappearing message setting');
       return;
     }
 
@@ -1103,7 +1098,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       isEqual(expireTimer, this.get('expireTimer'))
     ) {
       window.log.info(
-        'WIP:updateExpireTimer()  Dropping ExpireTimerUpdate message as we already have the same one set.'
+        'updateExpireTimer()  Dropping ExpireTimerUpdate message as we already have the same one set.'
       );
       return;
     }
@@ -1126,7 +1121,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       lastDisappearingMessageChangeTimestamp,
     });
 
-    window?.log?.info('WIP: Updating conversation disappearing messages setting', {
+    window?.log?.debug('Updating conversation disappearing messages setting', {
       id: this.idForLogging(),
       expirationType,
       expireTimer,
@@ -1197,7 +1192,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       // TODO Check that the args are correct
       // This might be happening too late in the message pipeline. Maybe should be moved to handleExpirationTimerUpdateNoCommit()
       if (expireUpdate.expirationType === 'deleteAfterRead') {
-        window.log.info('WIP: Note to Self messages cannot be delete after read!');
+        window.log.info('Note to Self messages cannot be delete after read!');
         return;
       }
 
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 2e8e6002a..c260567e1 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1280,7 +1280,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
         await this.commit();
       }
 
-      window?.log?.info('WIP: Set message expiration', {
+      window?.log?.debug('Set message expiration', {
         expiresAt,
         sentAt: this.get('sent_at'),
       });
diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts
index f158b6c81..82270a16d 100644
--- a/ts/receiver/contentMessage.ts
+++ b/ts/receiver/contentMessage.ts
@@ -417,7 +417,7 @@ export async function innerHandleSwarmContentMessage(
           expireUpdate
         );
         if (expireUpdate.isLegacyConversationSettingMessage) {
-          window.log.info('WIP: The legacy message is an expiration timer update. Ignoring it.');
+          window.log.info('The legacy message is an expiration timer update. Ignoring it.');
           return;
         }
       }
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index da728dfd1..6a0e64870 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -246,7 +246,7 @@ export async function handleSwarmDataMessage(
   if (expireUpdate && !isEmpty(expireUpdate)) {
     if (isSyncedMessage) {
       // TODO handle sync messages expiring separately?
-      window.log.info('WIP: Sync Message dropping');
+      window.log.debug('WIP: Sync Message dropping');
     } else {
       msgModel = handleExpireUpdate(convoToAddMessageTo, msgModel, expireUpdate);
     }
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 2316c0e07..b25003066 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -361,7 +361,7 @@ export async function handleMessageJob(
         (!expirationTimerUpdate || isEmpty(expirationTimerUpdate))
       ) {
         window.log.info(
-          'WIP: There is a problem with the expiration timer update',
+          'There is a problem with the expiration timer update',
           messageModel,
           expirationTimerUpdate
         );
@@ -380,7 +380,7 @@ export async function handleMessageJob(
       ) {
         confirm?.();
         window?.log?.info(
-          'WIP: Dropping ExpireTimerUpdate message as we already have the same one set.'
+          'Dropping ExpireTimerUpdate message as we already have the same one set.'
         );
         return;
       }
diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts
index e597a743a..c2330a9c7 100644
--- a/ts/session/apis/snode_api/SNodeAPI.ts
+++ b/ts/session/apis/snode_api/SNodeAPI.ts
@@ -554,8 +554,6 @@ export async function retrieveNextMessages(
     handleTimestampOffset('retrieve', json.t);
     await handleHardforkResult(json);
 
-    // console.log(`WIP: retrieveNextMessages`, json.messages);
-
     return json.messages || [];
   } catch (e) {
     window?.log?.warn('exception while parsing json of nextMessage:', e);
diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts
index f239039ef..cf405700a 100644
--- a/ts/session/apis/snode_api/expire.ts
+++ b/ts/session/apis/snode_api/expire.ts
@@ -31,7 +31,7 @@ async function generateSignature({
   // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N]
   const verificationString = `expire${shortenOrExtend}${timestamp}${messageHashes.join('')}`;
   const verificationData = StringUtils.encode(verificationString, 'utf8');
-  // window.log.info(`WIP: generateSignature verificationString ${verificationString}`);
+  window.log.debug(`generateSignature verificationString ${verificationString}`);
   const message = new Uint8Array(verificationData);
 
   const sodium = await getSodiumRenderer();
@@ -44,7 +44,7 @@ async function generateSignature({
       pubkey_ed25519: pubkey_ed25519.pubKey,
     };
   } catch (e) {
-    window.log.warn('WIP: generateSignature failed with: ', e.message);
+    window.log.warn('generateSignature failed with: ', e.message);
     return null;
   }
 }
@@ -68,7 +68,7 @@ async function verifySignature({
   unchangedHashes?: Record<string, string>;
 }): Promise<boolean> {
   if (!expiryApplied || isEmpty(messageHashes) || isEmpty(signature)) {
-    // window.log.info('WIP: WIP: verifySignature missing argument');
+    window.log.warn('verifySignature missing argument');
     return false;
   }
 
@@ -91,7 +91,7 @@ async function verifySignature({
 
   const verificationString = `${pubkey.key}${expiryApplied}${hashes.join('')}`;
   const verificationData = StringUtils.encode(verificationString, 'utf8');
-  // window.log.info(`WIP: verifySignature verificationString`, verificationString);
+  window.log.debug(`verifySignature verificationString`, verificationString);
 
   const sodium = await getSodiumRenderer();
   try {
@@ -103,7 +103,7 @@ async function verifySignature({
 
     return isValid;
   } catch (e) {
-    window.log.warn('WIP: verifySignature failed with: ', e.message);
+    window.log.warn('verifySignature failed with: ', e.message);
     return false;
   }
 }
@@ -115,20 +115,19 @@ async function processExpirationResults(
   messageHashes: Array<string>
 ) {
   if (isEmpty(swarm)) {
-    throw Error(`WIP: expireOnNodes failed! ${messageHashes}`);
+    throw Error(`expireOnNodes failed! ${messageHashes}`);
   }
 
   // TODO need proper typing for swarm and results
   const results: Record<string, { hashes: Array<string>; expiry: number }> = {};
-  // window.log.info(`WIP: processExpirationResults start`, swarm, messageHashes);
+  // window.log.debug(`processExpirationResults start`, swarm, messageHashes);
 
   for (const nodeKey of Object.keys(swarm)) {
-    // window.log.info(`WIP: processExpirationResults processing nodeKey`, nodeKey, swarm[nodeKey]);
     if (!isEmpty(swarm[nodeKey].failed)) {
       const reason = 'Unknown';
       const statusCode = '404';
       window?.log?.warn(
-        `WIP: loki_message:::expireMessage - Couldn't delete data from: ${
+        `loki_message:::expireMessage - Couldn't delete data from: ${
           targetNode.pubkey_ed25519
         }${reason && statusCode && ` due to an error ${reason} (${statusCode})`}`
       );
@@ -141,8 +140,6 @@ async function processExpirationResults(
     const expiryApplied = swarm[nodeKey].expiry;
     const signature = swarm[nodeKey].signature;
 
-    // window.log.info(`WIP: processExpirationResults swarm[nodeKey]`, swarm[nodeKey]);
-
     const isValid = await verifySignature({
       pubkey,
       snodePubkey: nodeKey,
@@ -155,7 +152,7 @@ async function processExpirationResults(
 
     if (!isValid) {
       window.log.warn(
-        'WIP: loki_message:::expireMessage - Signature verification failed!',
+        'loki_message:::expireMessage - Signature verification failed!',
         messageHashes
       );
     }
@@ -189,27 +186,21 @@ async function expireOnNodes(targetNode: Snode, params: ExpireParams) {
 
     try {
       const parsed = JSON.parse(result.body);
-      await processExpirationResults(params.pubkey, targetNode, parsed.swarm, params.messages);
-
-      // const expirationResults = await processExpirationResults(
-      //   params.pubkey,
-      //   targetNode,
-      //   parsed.swarm,
-      //   params.messages
-      // );
-      // window.log.info(`WIP: expireOnNodes attempt complete. Here are the results`, expirationResults);
+      const expirationResults = await processExpirationResults(
+        params.pubkey,
+        targetNode,
+        parsed.swarm,
+        params.messages
+      );
+      window.log.debug(`expireOnNodes attempt complete. Here are the results`, expirationResults);
 
       return true;
     } catch (e) {
-      window?.log?.warn('WIP: Failed to parse "swarm" result: ', e.msg);
+      window?.log?.warn('expireOnNodes Failed to parse "swarm" result: ', e.msg);
     }
     return false;
   } catch (e) {
-    window?.log?.warn(
-      'WIP: expire - send error:',
-      e,
-      `destination ${targetNode.ip}:${targetNode.port}`
-    );
+    window?.log?.warn('expire - send error:', e, `destination ${targetNode.ip}:${targetNode.port}`);
     throw e;
   }
 }
@@ -223,7 +214,6 @@ type ExpireMessageOnSnodeProps = {
 
 export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
   const { messageHash, expireTimer, extend, shorten } = props;
-  // window.log.info('WIP: expireMessageOnSnode running!');
 
   if (extend && shorten) {
     window.log.error(
@@ -270,8 +260,6 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
     signature: signResult?.signature,
   };
 
-  // window.log.info(`WIP: expireMessageOnSnode params`, params);
-
   const usedNodes = slice(swarm, 0, DEFAULT_CONNECTIONS);
   if (!usedNodes || usedNodes.length === 0) {
     throw new EmptySwarmError(ourPubKey.key, 'Ran out of swarm nodes to query');
@@ -289,7 +277,6 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
   try {
     const firstSuccessSnode = await firstTrue(promises);
     snode = firstSuccessSnode;
-    // window.log.info(`WIP: expireMessageOnSnode firstSuccessSnode`, firstSuccessSnode);
   } catch (e) {
     const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
     window?.log?.warn(
diff --git a/ts/session/utils/syncUtils.ts b/ts/session/utils/syncUtils.ts
index fee9c2acc..b68160988 100644
--- a/ts/session/utils/syncUtils.ts
+++ b/ts/session/utils/syncUtils.ts
@@ -349,7 +349,7 @@ export const buildSyncMessage = (
     if (expireUpdate && !isEmpty(expireUpdate)) {
       return buildSyncExpireTimerMessage(identifier, expireUpdate, timestamp, syncTarget);
     } else {
-      window.log.info('WIP: Building Sync Expire Timer Message failed', dataMessage, expireUpdate);
+      window.log.warn('Building Sync Expire Timer Message failed', dataMessage, expireUpdate);
     }
   }
   return buildSyncVisibleMessage(identifier, dataMessage, timestamp, syncTarget);
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index bdc6e7509..17141087f 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -235,8 +235,8 @@ export function setExpirationStartTimestamp(
 
   // TODO legacy messages support will be removed in a future release
   if (timestamp) {
-    window.log.info(
-      `WIP: We compare 2 timestamps for a disappear ${
+    window.log.debug(
+      `We compare 2 timestamps for a disappear ${
         isLegacyMode ? 'legacy' : mode === 'deleteAfterRead' ? 'after read' : 'after send'
       } message: \expirationStartTimestamp `,
       new Date(expirationStartTimestamp).toLocaleTimeString(),
@@ -248,22 +248,22 @@ export function setExpirationStartTimestamp(
 
   // TODO legacy messages support will be removed in a future release
   if (mode === 'deleteAfterRead') {
-    window.log.info(
-      `WIP: We set the start timestamp for a ${
+    window.log.debug(
+      `We set the start timestamp for a ${
         isLegacyMode ? 'legacy ' : ''
       }delete after read message to ${new Date(expirationStartTimestamp).toLocaleTimeString()}`
     );
   } else if (mode === 'deleteAfterSend') {
-    window.log.info(
-      `WIP: We set the start timestamp for a ${
+    window.log.debug(
+      `We set the start timestamp for a ${
         isLegacyMode ? 'legacy ' : ''
       }delete after send message to ${new Date(expirationStartTimestamp).toLocaleTimeString()}`
     );
   } else if (mode === 'off') {
-    window.log.info(`WIP: Disappearing message mode "${mode}" set. We can safely ignore this.`);
+    window.log.debug(`Disappearing message mode "${mode}" set. We can safely ignore this.`);
     expirationStartTimestamp = undefined;
   } else {
-    window.log.info(`WIP: Invalid disappearing message mode "${mode}" set. Ignoring`);
+    window.log.debug(`Invalid disappearing message mode "${mode}" set. Ignoring`);
     expirationStartTimestamp = undefined;
   }
 
@@ -332,7 +332,7 @@ export async function checkForExpireUpdate(
     isDisappearingMessagesV2Released &&
     (isLegacyDataMessage || isLegacyConversationSettingMessage || shouldDisappearButIsntMessage)
   ) {
-    window.log.info('WIP: received a legacy disappearing message after v2 was released.');
+    window.log.warn('Received a legacy disappearing message after v2 was released.', content);
     expirationType = convoToUpdate.get('expirationType');
     expirationTimer = convoToUpdate.get('expireTimer');
   }
@@ -346,8 +346,6 @@ export async function checkForExpireUpdate(
     isDisappearingMessagesV2Released,
   };
 
-  // window.log.info('WIP: checkForExpireUpdate', expireUpdate);
-
   return expireUpdate;
 }
 
@@ -358,9 +356,7 @@ export function handleExpireUpdate(
   expireUpdate: DisappearingMessageUpdate
 ) {
   if (converationModel.isPublic()) {
-    window.log.warning(
-      "WIP: updateExpireTimer() Disappearing messages aren't supported in communities"
-    );
+    window.log.warn("updateExpireTimer() Disappearing messages aren't supported in communities");
     return messageModel;
   }
 
diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts
index 97c8d1422..e809c5283 100644
--- a/ts/util/releaseFeature.ts
+++ b/ts/util/releaseFeature.ts
@@ -36,9 +36,7 @@ export async function checkIsFeatureReleased(featureName: string): Promise<boole
       if (featureAlreadyReleased) {
         // Feature is already released and we don't need to update the db
       } else {
-        window.log.info(
-          `WIP: [releaseFeature]: It is time to release ${featureName}. Releasing it now`
-        );
+        window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`);
         await Data.createOrUpdateItem({
           id: 'featureReleased',
           value: true,
@@ -59,7 +57,7 @@ export async function checkIsFeatureReleased(featureName: string): Promise<boole
   }
 
   window.log.info(
-    `WIP: [releaseFeature]: ${featureName} ${
+    `[releaseFeature]: ${featureName} ${
       Boolean(isFeatureReleased) ? 'is released' : 'has not been released yet'
     }`
   );