diff --git a/front/components/StarProgress.tsx b/front/components/StarProgress.tsx
index 8746e27..edbfec6 100644
--- a/front/components/StarProgress.tsx
+++ b/front/components/StarProgress.tsx
@@ -42,8 +42,6 @@ const StarProgress = (props: StarProgressProps) => {
 						style={{
 							position: 'absolute',
 							left: `${(step / props.max) * 100}%`,
-							// top: '50%',
-							// transform: 'translate(-50%, -55%)',
 						}}
 					/>
 				);
diff --git a/front/components/V2/GoldenRatio.tsx b/front/components/V2/GoldenRatio.tsx
index bedbc41..1502863 100644
--- a/front/components/V2/GoldenRatio.tsx
+++ b/front/components/V2/GoldenRatio.tsx
@@ -42,7 +42,7 @@ const cards = [
 const GoldenRatio = () => {
 	const screenSize = useBreakpointValue({ base: 'small', md: 'big' });
 	const isPhone = screenSize === 'small';
-	// return (<GoldenRatioPanel direction='column' header={<>r</>}>test</GoldenRatioPanel>)
+
 	return (
 		<GoldenRatioPanel
 			direction={isPhone ? 'column' : 'row'}
diff --git a/front/components/V2/GoldenRatioPanel.tsx b/front/components/V2/GoldenRatioPanel.tsx
index e5b0824..d1634cd 100644
--- a/front/components/V2/GoldenRatioPanel.tsx
+++ b/front/components/V2/GoldenRatioPanel.tsx
@@ -1,8 +1,5 @@
 import { View, ViewStyle } from 'react-native';
 
-const bigSideRatio = 1000;
-const smallSideRatio = 618;
-
 const bigSizePercent = '61.8%';
 const smallSizePercent = '38.2%';
 
diff --git a/front/views/PlayView.tsx b/front/views/PlayView.tsx
index 24bef16..1849ffa 100644
--- a/front/views/PlayView.tsx
+++ b/front/views/PlayView.tsx
@@ -310,6 +310,7 @@ const PlayView = ({ songId, route }: RouteProps<PlayViewProps>) => {
 	}
 	return (
 		<View style={{ display: 'flex', flex: 1, backgroundColor: '#cdd4fd' }}>
+			
 			<SafeAreaView
 				style={{
 					flexGrow: 1,
@@ -335,36 +336,36 @@ const PlayView = ({ songId, route }: RouteProps<PlayViewProps>) => {
 						zIndex: 100,
 					}}
 				>
-					{/* <PopupCC
-						title={translate('selectPlayMode')}
-						description={translate('selectPlayModeExplaination')}
-						isVisible={type === undefined}
-						setIsVisible={
-							navigation.canGoBack()
-								? (isVisible) => {
-										if (!isVisible) {
-											// If we dismiss the popup, Go to previous page
-											navigation.goBack();
-										}
-								  }
-								: undefined
-						}
-					>
-						<Row style={{ justifyContent: 'space-between' }}>
-							<ButtonBase
-								style={{}}
-								type="outlined"
-								title={translate('practiceBtn')}
-								onPress={async () => setType('practice')}
-							/>
-							<ButtonBase
-								style={{}}
-								type="filled"
-								title={translate('playBtn')}
-								onPress={async () => setType('normal')}
-							/>
-						</Row>
-					</PopupCC> */}
+					<PopupCC
+				title={translate('selectPlayMode')}
+				description={translate('selectPlayModeExplaination')}
+				isVisible={type === undefined}
+				setIsVisible={
+					navigation.canGoBack()
+						? (isVisible) => {
+								if (!isVisible) {
+									// If we dismiss the popup, Go to previous page
+									navigation.goBack();
+								}
+						  }
+						: undefined
+				}
+			>
+				<Row style={{ justifyContent: 'space-between' }}>
+					<ButtonBase
+						style={{}}
+						type="outlined"
+						title={translate('practiceBtn')}
+						onPress={async () => setType('practice')}
+					/>
+					<ButtonBase
+						style={{}}
+						type="filled"
+						title={translate('playBtn')}
+						onPress={async () => setType('normal')}
+					/>
+				</Row>
+			</PopupCC>
 					{(
 						[
 							[
diff --git a/front/views/V2/DiscoveryView.tsx b/front/views/V2/DiscoveryView.tsx
index 8c88cb5..d92563e 100644
--- a/front/views/V2/DiscoveryView.tsx
+++ b/front/views/V2/DiscoveryView.tsx
@@ -14,30 +14,6 @@ const HomeView = (props: RouteProps<{}>) => {
 	const navigation = useNavigation();
 	const screenSize = useBreakpointValue({ base: 'small', md: 'big' });
 	const isPhone = screenSize === 'small';
-	const artistsQueries = useQueries(
-		(songsQuery.data ?? []).map((song) => API.getArtist(song.artistId))
-	);
-
-	// React.useEffect(() => {
-	// 	if (!songsQuery.data) return;
-	// 	if (artistsQueries.every((query) => !query.isLoading)) return;
-
-	// 	(songsQuery.data ?? [])
-	// 		.filter((song) =>
-	// 			artistsQueries.find((artistQuery) => artistQuery.data?.id === song.artistId)
-	// 		)
-	// 		.forEach((song, index) => {
-	// 			if (index > 3) return;
-	// 			cards[index]!.image = song.cover;
-	// 			cards[index]!.title = song.name;
-	// 			cards[index]!.artist = artistsQueries.find(
-	// 				(artistQuery) => artistQuery.data?.id === song.artistId
-	// 			)!.data!.name;
-	// 			cards[index]!.onPress = () => {
-	// 				navigation.navigate('Play', { songId: song.id });
-	// 			};
-	// 		});
-	// }, [artistsQueries]);
 
 	return (
 		<ScaffoldCC routeName={props.route.name}>