diff --git a/motivator/src/app/page.tsx b/motivator/src/app/page.tsx
index 93fb73f..edcc7b4 100644
--- a/motivator/src/app/page.tsx
+++ b/motivator/src/app/page.tsx
@@ -45,10 +45,6 @@ const Signup = (props: Props) => {
     }, [assessorSlotID])
 
     const weekNumber = Number(process.env.NEXT_PUBLIC_WEEK_ACTUAL)
-    const weekMax = Number(process.env.NEXT_PUBLIC_WEEK_MAX)
-
-    // TODO : Rework this it's blocking the rendering
-    // const { data: assessorSlotsAvailable } = useGetNumberAssessorSlotAvailable()
 
     const ComponentToDisplay = () => {
         if (assessorSlotID?.res?.assessorSlotCore.id) {
diff --git a/motivator/src/core/components/datatables/DataTableAuditAssessorSlot.tsx b/motivator/src/core/components/datatables/DataTableAuditAssessorSlot.tsx
index 668c4ee..b7c5371 100644
--- a/motivator/src/core/components/datatables/DataTableAuditAssessorSlot.tsx
+++ b/motivator/src/core/components/datatables/DataTableAuditAssessorSlot.tsx
@@ -61,9 +61,6 @@ export const columns: ColumnDef<AuditAssessorsSlotsDatatable>[] = [
                     <Link
                         href={`/assessor/slot/${row.original.assessorSlotID.id}`}
                     >
-                        {/* <p className="font-extralight text-center text-xs">
-                        Assessor Addr
-                    </p> */}
                         <AddrAvatar
                             addressName={assessorAddress}
                             isDatatableStyle
@@ -92,7 +89,6 @@ export const columns: ColumnDef<AuditAssessorsSlotsDatatable>[] = [
                                         Assessor Slot ID
                                     </p>
                                     <div className="flex items-center gap-1">
-                                        {/* <AiOutlineAudit className="h-4 w-4" /> */}
                                         <p className="font-bold">
                                             {assessorSlotID.id}
                                         </p>
diff --git a/motivator/src/protocols/hyperdrive/components/datatables/container/DataTableContainerAssessor.tsx b/motivator/src/protocols/hyperdrive/components/datatables/container/DataTableContainerAssessor.tsx
index 878294e..a391fa6 100644
--- a/motivator/src/protocols/hyperdrive/components/datatables/container/DataTableContainerAssessor.tsx
+++ b/motivator/src/protocols/hyperdrive/components/datatables/container/DataTableContainerAssessor.tsx
@@ -73,26 +73,11 @@ export const DataTableContainerAssessor = () => {
         assessorSlotID: slotID as string,
     })
 
-    // const { data, error, status, refetch } = useGetAssessorSlotWithAddr({
-    //     assessorAddr: address as string,
-    // })
-
     // Refresh the data when the account is connected
     useEffect(() => {
         if (statusAccount === 'connected' && refetch) refetch()
     }, [refetch, statusAccount])
 
-    // // Redirecting to avoid error
-    // useEffect(() => {
-    //     if (data?.status == 'ko' || data?.res === undefined) {
-    //         // if (statusAccount === 'connected' && refetch) refetch()
-
-    //         if ((data?.res as AssessorSlot) === undefined) {
-    //             push(`/`)
-    //         }
-    //     }
-    // }, [data?.res])
-
     // Implement Skeletton
     if (status != 'success' || (data.res as AssessorSlot) === undefined) {
         return (