diff --git a/browser-domain/src/components/Home/Card/Card.tsx b/browser-domain/src/components/Home/Card/Card.tsx
index 78e92d2..6900065 100644
--- a/browser-domain/src/components/Home/Card/Card.tsx
+++ b/browser-domain/src/components/Home/Card/Card.tsx
@@ -28,42 +28,14 @@ interface CardProps {
 const { Text } = Typography;
 
 export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh }) => {
-    // const [error, setError] = useState<string | null>(null);
-    // const [subscribed, setSubscribed] = useState<boolean>(false);
-
-    // useEffect(() => {
-    //     setError(null);
-
-    //     const token = localStorage.getItem("token");
-    //     if (!token || !user) {
-    //         setError("No token!");
-    //         return;
-    //     }
-
-    //     const data = {
-    //         user_id: user.id,
-    //         flight_id: flight.id
-    //     }
-
-    //     getSubscription(data, token)
-    //         .then((data) => {
-    //             setSubscribed(true);
-    //         })
-    //         .catch((error) => {
-    //             setError(error as string);
-    //         });
-    // }, [user]);
     const [modalVisible, setModalVisible] = useState<boolean>(false);
 
     
     const handleSubscribe = async (event: React.FormEvent) => {
         event.preventDefault();
 
-        // setError(null);
-
         const token = localStorage.getItem("token");
         if (!token || !user) {
-            // setError("No token!");
             return;
         }
 
@@ -80,13 +52,10 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh })
                 getChatId(user.id, token)
                     .then(() => {})
                     .catch((error) => {
-                        console.log("NO CHAT")
                         setModalVisible(true);
-                        // setError(error as string);
                     })
             })
             .catch((error) => {
-                // setError(error as string);
         });
     };
 
@@ -97,11 +66,8 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh })
     const handleUnsubscribe = async (event: React.FormEvent) => {
         event.preventDefault();
 
-        // setError(null);
-
         const token = localStorage.getItem("token");
         if (!token || !user) {
-            // setError("No token!");
             return;
         }
 
@@ -114,11 +80,9 @@ export const Card: React.FC<CardProps> = ({ flight, user, subscribed, refresh })
 
         unsubscribeFromFlight(data, token)
             .then(() => {
-                console.log("?")
                 refresh()
             })
             .catch((error) => {
-                // setError(error as string);
         });
     };
 
diff --git a/browser-domain/src/components/Home/Home.tsx b/browser-domain/src/components/Home/Home.tsx
index 2c252b9..b669c66 100644
--- a/browser-domain/src/components/Home/Home.tsx
+++ b/browser-domain/src/components/Home/Home.tsx
@@ -1,11 +1,10 @@
 import React, { useEffect, useState } from "react";
 import { Card } from "./Card/Card";
 import { useFetchFlights } from "../../hooks/useFetchFlights";
-import { Flight, SubscriptionsCreate } from "../../Types";
+import { Flight } from "../../Types";
 import { useNavigate } from "react-router";
 import useAuth from "../../useAuth";
 import { useFetchSubscriptions } from "../../hooks/useFetchSubscriptions";
-import { fetchSubscriptions } from "../../Api";
 
 interface Props {
     flights?: Flight[];
@@ -29,25 +28,6 @@ export const Home: React.FC<Props> = (props) => {
         navigate(`?${newParams.toString()}`);
     }, [currentPage, navigate]);
 
-    // const [errorSub, setErrorSub] = useState<string | null>(null);
-    // const [subscriptions, setSubscriptions] = useState<SubscriptionsCreate[]>([]);
-
-    // useEffect(() => {
-    //     setErrorSub(null);
-
-    //     console.log(user)
-    //     console.log(token)
-    //     if (!user || !token) {
-    //         return;
-    //     }
-
-    //     fetchSubscriptions(user.id, token)
-    //         .then((data) => {
-    //             setSubscriptions(data);
-    //         })
-    //         .catch((error) => { });
-    // }, [user, token, loading]);
-
     const goToPrevPage = () => {
         if (currentPage > 1) {
             setCurrentPage(currentPage - 1);
@@ -70,8 +50,6 @@ export const Home: React.FC<Props> = (props) => {
         return <div>Loading...</div>;
     }
 
-    // console.log(subscriptions)
-
     return (
         <div className="Box">
             {isAirline ? <button onClick={() => { navigate("/create-flight") }}>Create flight</button> : <></>}
diff --git a/browser-domain/src/hooks/useFetchSubscriptions.tsx b/browser-domain/src/hooks/useFetchSubscriptions.tsx
index 99ed464..a9c7591 100644
--- a/browser-domain/src/hooks/useFetchSubscriptions.tsx
+++ b/browser-domain/src/hooks/useFetchSubscriptions.tsx
@@ -27,20 +27,5 @@ export const useFetchSubscriptions  = (user: User | undefined, token: string | u
         fetchData()
     }, [fetchData]);
 
-    // useEffect(() => {
-    //     setError(null);
-
-    //     if (!user || !token || !loading) {
-    //         return;
-    //     }
-
-    //     fetchSubscriptions(user.id, token)
-    //         .then((data) => {
-    //             setSubscriptions(data);
-    //             setLoading(false)
-    //         })
-    //         .catch((error) => { });
-    // }, [user, token]);
-
     return { subscriptions, error, loading, fetchData };
 };
diff --git a/gateway/src/api/main.py b/gateway/src/api/main.py
index a03bd2c..771e61c 100644
--- a/gateway/src/api/main.py
+++ b/gateway/src/api/main.py
@@ -7,9 +7,6 @@ from logmiddleware import RouterLoggingMiddleware, logging_config
 from src.api.config import API_DEBUG
 from src.api.routes import auth, flights, health, notifications, subscriptions, users
 
-# from src.api.log import RouterLoggingMiddleware, logging_config
-
-
 logging.config.dictConfig(logging_config)
 logger = logging.getLogger(__name__)
 
diff --git a/subscription-domain/subscription-manager/src/api/routes/subscriptions.py b/subscription-domain/subscription-manager/src/api/routes/subscriptions.py
index c4b1866..93ecde6 100644
--- a/subscription-domain/subscription-manager/src/api/routes/subscriptions.py
+++ b/subscription-domain/subscription-manager/src/api/routes/subscriptions.py
@@ -16,19 +16,9 @@ def create_subscription(subscription: Subscription, db: Session = Depends(get_db
         db_subscription = sub_crud.create_subscription(db=db, subscription=subscription)
     except ValueError:
         raise HTTPException(status_code=409, detail="User already suscribed")
-    # if notif_crud.get_chat_id(subscription.user_id) is None:
-    #     raise HTTPException(status_code=424, detail="First you need to create a chat")
     return db_subscription
 
 
-# @router.get("/{user_id}", response_model=list[Subscription])
-# def get_subscriptions(user_id: int, db: Session = Depends(get_db)):
-#     db_subscriptions = sub_crud.get_subscriptions(db=db, user_id=user_id)
-#     if db_subscriptions is None:
-#         raise HTTPException(status_code=404, detail="Subscription not found")
-#     return db_subscriptions
-
-
 @router.get("")
 def get_subscription(
     user_id: int, flight_id: Optional[int] = None, db: Session = Depends(get_db)
diff --git a/subscription-domain/subscription-manager/src/api/utils/messages.py b/subscription-domain/subscription-manager/src/api/utils/messages.py
index 83f8cb9..e325c59 100644
--- a/subscription-domain/subscription-manager/src/api/utils/messages.py
+++ b/subscription-domain/subscription-manager/src/api/utils/messages.py
@@ -31,7 +31,6 @@ def get_invalid_message():
     return (
         "Invalid option!\nPlease use:\n"
         "\n/flight NUMBER (e.g., /flight 1) for flight details"
-        # "\n/start to start receiving messages"
         "\n/stop to stop receiving updates."
     )