diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index ac0b61dbf..de352f08d 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -40,6 +40,7 @@ import {
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionIconButton } from '../icon';
 import { ConversationHeaderMenu } from '../menu/ConversationHeaderMenu';
+import { Flex } from '../basic/Flex';
 
 export interface TimerOption {
   name: string;
@@ -366,7 +367,7 @@ export const ConversationHeaderWithDetails = () => {
         </div>
 
         {!isSelectionMode && (
-          <ConversationHeaderRightContainer>
+          <Flex flexDirection="row" alignItems="center">
             {!isKickedFromGroup && (
               <ExpirationLength expirationSettingName={expirationSettingName} />
             )}
@@ -378,7 +379,7 @@ export const ConversationHeaderWithDetails = () => {
               pubkey={selectedConvoKey}
               showBackButton={isMessageDetailOpened}
             />
-          </ConversationHeaderRightContainer>
+          </Flex>
         )}
 
         <ConversationHeaderMenu triggerId={triggerId} />
@@ -388,9 +389,3 @@ export const ConversationHeaderWithDetails = () => {
     </div>
   );
 };
-
-export const ConversationHeaderRightContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-`;
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 91db6646f..da70fe075 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -59,9 +59,6 @@ async function handleGroupsAndContactsFromConfigMessage(
   const lastConfigTimestamp = lastConfigUpdate?.timestamp;
   const isNewerConfig = lastConfigTimestamp && lastConfigTimestamp < _.toNumber(envelope.timestamp);
 
-  // const didWeHandleAConfigurationMessageAlready =
-  //   (await getItemById(hasSyncedInitialConfigurationItem))?.value || false;
-  // if (didWeHandleAConfigurationMessageAlready) {
   if (isNewerConfig) {
     window?.log?.info(
       'Dropping configuration groups change as we already handled one... Only handling contacts '
@@ -154,7 +151,6 @@ const handleContactReceived = async (
     // checking for existence of field on protobuf
     if (contactReceived.isApproved === true) {
       if (!contactConvo.isApproved()) {
-        // TODO: add message search in convo for pre-existing msgRequestResponse msg only happens once per convo
         await contactConvo.setIsApproved(Boolean(contactReceived.isApproved));
         await contactConvo.addOutgoingApprovalMessage(_.toNumber(envelope.timestamp));
       }
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 681a49469..e51107e7d 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -353,7 +353,6 @@ export const _getLeftPaneLists = (
       directConversations.push(conversation);
     }
 
-    // if (!conversation.isApproved && !conversation.isBlocked) {
     if (!conversation.isApproved) {
       // dont increase unread counter, don't push to convo list.
       continue;