diff --git a/app/src/screens/MainScreen.tsx b/app/src/screens/MainScreen.tsx
index 3539b883b..6c166c189 100644
--- a/app/src/screens/MainScreen.tsx
+++ b/app/src/screens/MainScreen.tsx
@@ -1,14 +1,9 @@
 import React, { useState, useEffect} from 'react';
-import { YStack, XStack, Text, Button } from 'tamagui';
-import { SizableText, Tabs, H5, styled , Dialog, Adapt, Sheet, Label , Fieldset, Input, Unspaced, Switch} from 'tamagui'
-import { BadgeInfo , Scan, UserCheck , Settings , HelpCircle, XCircle , IterationCw} from '@tamagui/lucide-icons'; 
-import { ThemeableStack } from 'tamagui' // or '@tamagui/stacks'
-
+import { YStack, XStack, Text, Button, SizableText, Tabs, styled , Dialog, Adapt, Sheet, Label , Fieldset, Input, Switch ,ThemeableStack} from 'tamagui'
+import { Scan, UserCheck , HelpCircle, XCircle , IterationCw} from '@tamagui/lucide-icons'; 
 import ScanScreen from './ScanScreen';
 import ProveScreen from './ProveScreen';
 import { Steps } from '../utils/utils';
-import { Popover } from 'tamagui'
-import { CloseCircleIcon, InfoIcon } from '@gluestack-ui/themed';
 
 const MainScreen = (
     {onStartCameraScan,
@@ -35,12 +30,7 @@ const MainScreen = (
     setDateOfExpiry
     }
 ) => {
-  // placeholder function for button press
   const [selectedTab, setSelectedTab] = useState("scan");
-  const handleOpenCamera = () => {
-    console.log('Camera button pressed');
-    // your camera opening logic goes here
-  };
   const [brokenCamera,setBrokenCamera] = useState(false);
   const [open, setOpen] = useState(false)
   const MyCard = styled(ThemeableStack, {
@@ -57,12 +47,11 @@ const MainScreen = (
 
   }
   useEffect(() => {
-    // Check if passportNumber length is 9 and either dateOfBirth or dateOfExpiry length is 6
+    // Check if length of each field is correct and move to step MRZ_SCAN_COMPLETED if so
     if (passportNumber?.length === 9 && (dateOfBirth?.length === 6 && dateOfExpiry?.length === 6)) {
         setStep(Steps.MRZ_SCAN_COMPLETED);
     }
-    console.log("passportNumber");
-}, [passportNumber, dateOfBirth, dateOfExpiry]); // Dependencies array
+}, [passportNumber, dateOfBirth, dateOfExpiry]);
 
   return (
     <YStack f={1} ai="center" jc="space-between" bc="#fff">
@@ -190,8 +179,7 @@ const MainScreen = (
                     <ScanScreen
                       onStartCameraScan={onStartCameraScan}
                       nfcScan = {nfcScan}
-                      step={step}
-                      setStep = {setStep}/>
+                      step={step}/>
                 </Tabs.Content>
                 <Tabs.Content value="generate">
                 <ProveScreen
diff --git a/app/src/screens/ProveScreen.tsx b/app/src/screens/ProveScreen.tsx
index c7dd9b722..deaf8be04 100644
--- a/app/src/screens/ProveScreen.tsx
+++ b/app/src/screens/ProveScreen.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { YStack,XStack, Text, Checkbox, Input, Button, Spinner ,SizableText} from 'tamagui';
-import { Check , Cross, Croissant} from '@tamagui/lucide-icons';
+import { Check } from '@tamagui/lucide-icons';
 import { getFirstName, formatDuration } from '../../utils/utils';
 import { attributeToPosition } from '../../../common/src/constants/constants';
 import { Steps } from '../utils/utils';
diff --git a/app/src/screens/ScanScreen.tsx b/app/src/screens/ScanScreen.tsx
index fe5bcbed2..8efa9e26b 100644
--- a/app/src/screens/ScanScreen.tsx
+++ b/app/src/screens/ScanScreen.tsx
@@ -1,8 +1,7 @@
 import React, {useState, useEffect} from 'react';
-import { YStack, Text,Spinner , Circle, ZStack, XStack, Input, View, SizableStack, SizableText, Square } from 'tamagui'; // Ensure correct import paths based on your project setup
+import { YStack, Text,Spinner , Circle, ZStack, XStack, SizableText } from 'tamagui'; // Ensure correct import paths based on your project setup
 import { Steps } from '../utils/utils';
-import { Keyboard } from 'react-native';
-const ScanScreen = ({onStartCameraScan,nfcScan,step,setStep}) => {
+const ScanScreen = ({onStartCameraScan,nfcScan,step}) => {