diff --git a/app/(root)/(tabs)/home.tsx b/app/(root)/(tabs)/home.tsx
index 65171bf..9c61b81 100644
--- a/app/(root)/(tabs)/home.tsx
+++ b/app/(root)/(tabs)/home.tsx
@@ -24,7 +24,9 @@ const Home = () => {
   const { setUserLocation, setDestinationLocation } = useLocationStore();
   const { signOut } = useAuth();
   const { user } = useUser();
-  const { data: recentRides, loading } = useFetch(`/(api)/ride/${user?.id}`);
+  const { data: recentRides, loading } = useFetch<Ride[]>(
+    `/(api)/ride/${user?.id}`,
+  );
 
   const [hasPermissions, setHasPermissions] = useState(false);
 
@@ -71,7 +73,7 @@ const Home = () => {
   return (
     <SafeAreaView className="bg-general-500">
       <FlatList
-        data={(recentRides as Ride[])?.slice(0, 5)}
+        data={recentRides?.slice(0, 5)}
         renderItem={({ item }) => <RideCard ride={item} />}
         className="px-5"
         keyboardShouldPersistTaps="handled"
diff --git a/app/(root)/(tabs)/profile.tsx b/app/(root)/(tabs)/profile.tsx
index e718dd5..9aa1e81 100644
--- a/app/(root)/(tabs)/profile.tsx
+++ b/app/(root)/(tabs)/profile.tsx
@@ -30,7 +30,7 @@ const Profile = () => {
           <View className="flex flex-col items-start justify-start w-full">
             <InputField
               label="First name"
-              placeholder={user?.firstName || "Not Found"}
+              placeholder={user?.firstName ?? "Your First name"}
               containerStyles="w-full mb-4"
               inputStyles="p-3.5"
               editable={false}
@@ -38,7 +38,7 @@ const Profile = () => {
 
             <InputField
               label="Last name"
-              placeholder={user?.lastName || "Not Found"}
+              placeholder={user?.lastName ?? "Your Last name"}
               containerStyles="w-full mb-4"
               inputStyles="p-3.5"
               editable={false}
@@ -47,7 +47,7 @@ const Profile = () => {
             <InputField
               label="Email"
               placeholder={
-                user?.primaryEmailAddress?.emailAddress || "Not Found"
+                user?.primaryEmailAddress?.emailAddress ?? "Your Email address"
               }
               containerStyles="w-full mb-4"
               inputStyles="p-3.5"
diff --git a/components/google-text-input.tsx b/components/google-text-input.tsx
index 28a5634..7357afe 100644
--- a/components/google-text-input.tsx
+++ b/components/google-text-input.tsx
@@ -1,8 +1,8 @@
-import { View, Image, TouchableOpacity } from "react-native";
+import { View, Image } from "react-native";
 import { GooglePlacesAutocomplete } from "react-native-google-places-autocomplete";
 
 import { icons } from "@/constants";
-import { GoogleInputProps } from "@/types/type";
+import type { GoogleInputProps } from "@/types/type";
 
 export const GoogleTextInput = ({
   icon,
@@ -64,24 +64,14 @@ export const GoogleTextInput = ({
           language: "en",
         }}
         renderLeftButton={() => (
-          // TODO: replace later with View and remove onPress
-          <TouchableOpacity
-            onPress={() => {
-              handlePress({
-                latitude: 26.8467,
-                longitude: 80.9462,
-                address: "Lucknow, Uttar Pradesh",
-              });
-            }}
-            className="justify-center items-center w-6 h-6"
-          >
+          <View className="justify-center items-center w-6 h-6">
             <Image
               source={icon ? icon : icons.search}
               alt="Search"
               className="w-6 h-6"
               resizeMode="contain"
             />
-          </TouchableOpacity>
+          </View>
         )}
         textInputProps={{
           placeholderTextColor: "gray",
diff --git a/components/map.tsx b/components/map.tsx
index 8a9a796..1a905a6 100644
--- a/components/map.tsx
+++ b/components/map.tsx
@@ -13,74 +13,6 @@ import {
 import { useDriverStore, useLocationStore } from "@/store";
 import type { Driver, MarkerData } from "@/types/type";
 
-// TODO: Remove mocked drivers later
-const mockedDrivers = [
-  {
-    id: 1,
-    driver_id: 1,
-    first_name: "James",
-    last_name: "Wilson",
-    profile_image_url:
-      "https://ucarecdn.com/dae59f69-2c1f-48c3-a883-017bcf0f9950/-/preview/1000x666/",
-    car_image_url:
-      "https://ucarecdn.com/a2dc52b2-8bf7-4e49-9a36-3ffb5229ed02/-/preview/465x466/",
-    car_seats: 4,
-    rating: 4.8,
-    latitude: 0,
-    longitude: 0,
-    price: "45",
-    time: 5,
-  },
-  {
-    id: 2,
-    driver_id: 2,
-    first_name: "David",
-    last_name: "Brown",
-    profile_image_url:
-      "https://ucarecdn.com/6ea6d83d-ef1a-483f-9106-837a3a5b3f67/-/preview/1000x666/",
-    car_image_url:
-      "https://ucarecdn.com/a3872f80-c094-409c-82f8-c9ff38429327/-/preview/930x932/",
-    car_seats: 5,
-    rating: 4.6,
-    latitude: 0,
-    longitude: 0,
-    price: "45",
-    time: 5,
-  },
-  {
-    id: 3,
-    driver_id: 3,
-    first_name: "Michael",
-    last_name: "Johnson",
-    profile_image_url:
-      "https://ucarecdn.com/0330d85c-232e-4c30-bd04-e5e4d0e3d688/-/preview/826x822/",
-    car_image_url:
-      "https://ucarecdn.com/289764fb-55b6-4427-b1d1-f655987b4a14/-/preview/930x932/",
-    car_seats: 4,
-    rating: 4.7,
-    latitude: 0,
-    longitude: 0,
-    price: "45",
-    time: 5,
-  },
-  {
-    id: 4,
-    driver_id: 4,
-    first_name: "Robert",
-    last_name: "Green",
-    profile_image_url:
-      "https://ucarecdn.com/fdfc54df-9d24-40f7-b7d3-6f391561c0db/-/preview/626x417/",
-    car_image_url:
-      "https://ucarecdn.com/b6fb3b55-7676-4ff3-8484-fb115e268d32/-/preview/930x932/",
-    car_seats: 4,
-    rating: 4.9,
-    latitude: 0,
-    longitude: 0,
-    price: "45",
-    time: 5,
-  },
-];
-
 export const Map = () => {
   const { data: drivers, loading, error } = useFetch<Driver[]>("/(api)/driver");
 
@@ -117,21 +49,15 @@ export const Map = () => {
 
   useEffect(() => {
     if (markers.length > 0 && destinationLatitude && destinationLatitude) {
-      // TODO: Uncomment this code block
-
-      /* calculateDriverTimes({
+      calculateDriverTimes({
         markers,
         userLatitude,
         userLongitude,
         destinationLatitude,
         destinationLongitude,
-      })
-        .then((drivers) => {
-          setDrivers(drivers as MarkerData[]);
-        }) */
-
-      // TODO: Remove this line
-      setDrivers(mockedDrivers);
+      }).then((drivers) => {
+        setDrivers(drivers as MarkerData[]);
+      });
     }
   }, [
     markers,