diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
index 483ff0ec6..be2c5bbb4 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/ScheduledInterview/PendingInterview/index.tsx
@@ -2,19 +2,16 @@ import {
   Button,
   ButtonType,
   ButtonSize,
-  ButtonVariant,
 } from "@litespace/luna/Button";
 import { asFullAssetUrl } from "@litespace/luna/backend";
 import { useFormatMessage } from "@litespace/luna/hooks/intl";
 import { ISession } from "@litespace/types";
 import React from "react";
-import { Link } from "react-router-dom";
-import { Route } from "@/types/routes";
 
 const PendingInterview: React.FC<{
   interviewer: ISession.PopuldatedMember;
   session: ISession.Self;
-}> = ({ interviewer, session }) => {
+}> = ({ interviewer }) => {
   const intl = useFormatMessage();
   return (
     <div>
@@ -57,6 +54,7 @@ const PendingInterview: React.FC<{
           </p>
 
           <div className="flex flex-row gap-4 mt-6">
+            {/*
             <Link to={Route.Call.replace(":id", session.sessionId)}>
               <Button
                 size={ButtonSize.Small}
@@ -66,6 +64,7 @@ const PendingInterview: React.FC<{
                 {intl("global.labels.go")}
               </Button>
             </Link>
+            */}
             <Button size={ButtonSize.Small} type={ButtonType.Error}>
               {intl("global.labels.cancel")}
             </Button>
diff --git a/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx
index 2ce4becd8..f1b72c81d 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/Interview/index.tsx
@@ -6,7 +6,6 @@ import RawHtml from "@/components/TutorOnboardingSteps/RawHtml";
 // import ScheduledInterview from "@/components/TutorOnboardingSteps/Interview/ScheduledInterview";
 
 const Interview: React.FC<{
-  interviews: IInterview.FindPagedInterviewsProps;
   current: Element<IInterview.FindInterviewsApiResponse["list"]> | null;
 }> = ({ current }) => {
   // const onScheduleSuccess = useCallback(() => {
diff --git a/apps/nova/src/components/TutorOnboardingSteps/index.tsx b/apps/nova/src/components/TutorOnboardingSteps/index.tsx
index 86af132e1..a45ce790e 100644
--- a/apps/nova/src/components/TutorOnboardingSteps/index.tsx
+++ b/apps/nova/src/components/TutorOnboardingSteps/index.tsx
@@ -6,11 +6,10 @@ import { Element, IInterview } from "@litespace/types";
 
 const TutorOnboardingSteps: React.FC<{
   step: number;
-  interviews: IInterview.FindPagedInterviewsProps;
   current: Element<IInterview.FindInterviewsApiResponse["list"]> | null;
-}> = ({ step, interviews, current }) => {
+}> = ({ step, current }) => {
   if (step === TutorOnboardingStep.Interview)
-    return <Interview interviews={interviews} current={current} />;
+    return <Interview current={current} />;
   if (step === TutorOnboardingStep.Media) return <MediaShot />;
   if (step === TutorOnboardingStep.Profile) return "todo";
   return null;
diff --git a/apps/nova/src/pages/Call.tsx b/apps/nova/src/pages/Call.tsx
index 999514349..9d5c365dd 100644
--- a/apps/nova/src/pages/Call.tsx
+++ b/apps/nova/src/pages/Call.tsx
@@ -16,12 +16,11 @@ import cn from "classnames";
 // import Messages from "@/components/Chat/Messages";
 import { orNull, orUndefined } from "@litespace/sol/utils";
 import {
-  useSessionMembers,
-  // useCall,
+  //useSessionMembers,
+  //usePeerIds,
   useSessionV2,
   useFindSessionRoomById,
   useFullScreen,
-  usePeerIds,
 } from "@litespace/headless/sessions";
 import { useDisplayRecorder } from "@litespace/headless/recorder";
 import { isGhost } from "@/lib/ghost";
@@ -56,8 +55,8 @@ const Call: React.FC = () => {
     return callRoom.data.members.find((member) => member.id !== user?.id);
   }, [callRoom.data, user?.id]);
 
-  const members = useSessionMembers(sessionId);
-  useEffect(() => console.log("In App members: ", members), [members]);
+  //const members = useSessionMembers(sessionId);
+  //useEffect(() => console.log("In App members: ", members), [members]);
 
   // const messages = useMemo(
   //   () =>
@@ -118,6 +117,7 @@ const Call: React.FC = () => {
 
   const fullScreen = useFullScreen<HTMLDivElement>();
 
+  /*
   const peers = usePeerIds(
     useMemo(
       () => ({
@@ -130,6 +130,7 @@ const Call: React.FC = () => {
       [sessionId, mateInfo?.id, user?.role]
     )
   );
+  */
 
   const onCloseSession = useCallback(() => {
     // peers.ghost.refetch();
@@ -150,12 +151,12 @@ const Call: React.FC = () => {
     useMemo(
       () => ({
         isGhost,
-        ghostPeerId: orNull(peers.ghost.data),
-        tutorPeerId: orNull(peers.tutor.data),
+        ghostPeerId: orNull("ghost"), // TODO: pass peers.ghost.data
+        tutorPeerId: orNull("ghost"), // TODO: pass peers.tutor.data
         userId: orNull(user?.id),
         onCloseSession,
       }),
-      [onCloseSession, peers.ghost.data, peers.tutor.data, user?.id]
+      [onCloseSession, user?.id]
     )
   );
 
@@ -302,12 +303,14 @@ const Call: React.FC = () => {
               /*
                * TODO: replace this by members views
                */
+              /*
               <div>
                 <h1>Joined members</h1>
                 {members.map((m) => (
                   <label className="mx-1">-{m}-</label>
                 ))}
               </div>
+              */
             }
 
             {/* <Button
diff --git a/packages/atlas/src/atlas.ts b/packages/atlas/src/atlas.ts
index 9dfbd6b07..b18436e2e 100644
--- a/packages/atlas/src/atlas.ts
+++ b/packages/atlas/src/atlas.ts
@@ -1,7 +1,6 @@
 import { User } from "@/user";
 import { Auth } from "@/auth";
 import { Backend } from "@litespace/types";
-import { Session } from "@/session";
 import { Plan } from "@/plan";
 import { Coupon } from "@/coupon";
 import { Invite } from "@/invite";
@@ -18,12 +17,10 @@ import { Invoice } from "@/invoice";
 import { Topic } from "@/topic";
 import { AuthToken } from "@/client";
 import { Cache } from "@/cache";
-import { Peer } from "@/peer";
 
 export class Atlas {
   public readonly user: User;
   public readonly auth: Auth;
-  public readonly session: Session;
   public readonly plan: Plan;
   public readonly coupon: Coupon;
   public readonly invite: Invite;
@@ -39,12 +36,10 @@ export class Atlas {
   public readonly invoice: Invoice;
   public readonly cache: Cache;
   public readonly topic: Topic;
-  public readonly peer: Peer;
 
   constructor(backend: Backend, token: AuthToken | null) {
     this.user = new User(backend, token);
     this.auth = new Auth(backend, token);
-    this.session = new Session(backend, token);
     this.plan = new Plan(backend, token);
     this.coupon = new Coupon(backend, token);
     this.invite = new Invite(backend, token);
@@ -60,6 +55,5 @@ export class Atlas {
     this.invoice = new Invoice(backend, token);
     this.cache = new Cache(backend, token);
     this.topic = new Topic(backend, token);
-    this.peer = new Peer(backend, token);
   }
 }
diff --git a/packages/atlas/src/chat.ts b/packages/atlas/src/chat.ts
index 03a9266f5..e42afa0c3 100644
--- a/packages/atlas/src/chat.ts
+++ b/packages/atlas/src/chat.ts
@@ -41,10 +41,6 @@ export class Chat extends Base {
     return await this.get({ route: `/api/v1/chat/room/members/${room}` });
   }
 
-  async findSessionRoom(session: string): Promise<IRoom.FindSessionRoomApiResponse> {
-    return await this.get({ route: `/api/v1/chat/room/session/${session}` });
-  }
-
   async updateRoom(
     room: number,
     payload: IRoom.UpdateRoomApiPayload
diff --git a/packages/atlas/src/peer.ts b/packages/atlas/src/peer.ts
deleted file mode 100644
index 920fc0b23..000000000
--- a/packages/atlas/src/peer.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Base } from "@/base";
-import { IPeer } from "@litespace/types";
-
-export class Peer extends Base {
-  /**
-   * @deprecated we will use web sockets to register peer ids
-   */
-  async register(payload: IPeer.RegisterPeerIdApiPayload) {
-    await this.post({ route: "/api/v1/peer", payload });
-  }
-
-  /**
-   * @deprecated we will use web sockets to de-register peer ids
-   */
-  async delete(payload: IPeer.DeletePeerIdApiQurey) {
-    await this.del({ route: "/api/v1/peer", payload });
-  }
-
-  async findPeerId(
-    payload: IPeer.FindPeerIdApiQuery
-  ): Promise<IPeer.FindPeerIdApiResponse> {
-    return this.get({ route: "/api/v1/peer", payload });
-  }
-}
diff --git a/packages/atlas/src/session.ts b/packages/atlas/src/session.ts
deleted file mode 100644
index 842c7a730..000000000
--- a/packages/atlas/src/session.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Base } from "@/base";
-import { ISession } from "@litespace/types";
-
-export class Session extends Base {
-  async findUserSessions(userId: number): Promise<ISession.FindUserSessionsApiResponse> {
-    return await this.get({ route: `/api/v1/session/list/user/${userId}` });
-  }
-
-  async findSessionMembers(sessionId: string): Promise<ISession.FindSessionMembersApiResponse> {
-    return await this.get({ route: `/api/v1/session/${sessionId}/members` });
-  }
-}
diff --git a/packages/headless/src/sessions.ts b/packages/headless/src/sessions.ts
index bf5d7382d..53d8a5536 100644
--- a/packages/headless/src/sessions.ts
+++ b/packages/headless/src/sessions.ts
@@ -1,4 +1,4 @@
-import { ISession, IPeer, IRoom, IUser, Void, Wss } from "@litespace/types";
+import { ISession, IRoom, Void, Wss } from "@litespace/types";
 import { useQuery, UseQueryResult } from "@tanstack/react-query";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useAtlas } from "@/atlas/index";
@@ -7,9 +7,7 @@ import { useSocket } from "@/socket";
 import { usePeer } from "@/peer";
 import { MediaConnection } from "peerjs";
 import { orUndefined } from "@litespace/sol/utils";
-import { QueryKey } from "@/constants";
 import zod from "zod";
-import { ServerEvent, ServerEventsMap } from "@litespace/types/dist/esm/wss";
 
 declare module "peerjs" {
   export interface CallOption {
@@ -364,9 +362,7 @@ export function useSession({
         // call.on("stream", setMateMediaStream);
         call.on("stream", (stream: MediaStream) => addStream(call, stream));
         call.on("close", () => onMediaConnectionClose(call));
-      }, 3000);
-    },
-    [
+      }, 3000); }, [
       onMediaConnectionClose,
       addMediaConnection,
       addStream,
@@ -680,62 +676,6 @@ export function useCallEvents(
   };
 }
 
-// todo: move to peer.ts
-export function useFindPeerId(payload?: IPeer.FindPeerIdApiQuery) {
-  const atlas = useAtlas();
-
-  const findPeerId = useCallback(async () => {
-    if (!payload) return null;
-    const result = await atlas.peer.findPeerId(payload);
-    if (result.peer === null) throw new Error("Peer not found");
-    return result.peer;
-  }, [atlas.peer, payload]);
-
-  return useQuery({
-    queryFn: findPeerId,
-    queryKey: [QueryKey.FindPeerId, payload],
-    retryDelay: (attempt) => {
-      if (attempt <= 10) return 2_000;
-      return Math.min(1_000 * 2 ** attempt, 30_000);
-    },
-    enabled: !!payload,
-  });
-}
-
-export function usePeerIds({
-  isGhost,
-  sessionId,
-  role,
-  mateUserId,
-  disableGhost = false,
-}: {
-  isGhost: boolean;
-  sessionId: string | null;
-  role: IUser.Role | null;
-  mateUserId: number | null;
-  disableGhost?: boolean;
-}) {
-  const findGhostPeerIdQuery = useMemo(():
-    | IPeer.FindPeerIdApiQuery
-    | undefined => {
-    if (isGhost || !sessionId || disableGhost) return;
-    return { type: IPeer.PeerType.Ghost, session: sessionId };
-  }, [sessionId, disableGhost, isGhost]);
-
-  const findTutorPeerIdQuery = useMemo(():
-    | IPeer.FindPeerIdApiQuery
-    | undefined => {
-    const allowed =
-      role === IUser.Role.Student || role === IUser.Role.TutorManager;
-    if (isGhost || !mateUserId || !allowed) return;
-    return { type: IPeer.PeerType.Tutor, tutor: mateUserId };
-  }, [isGhost, mateUserId, role]);
-
-  const ghostPeerId = useFindPeerId(findGhostPeerIdQuery);
-  const tutorPeerId = useFindPeerId(findTutorPeerIdQuery);
-  return { ghost: ghostPeerId, tutor: tutorPeerId };
-}
-
 const ghostCallMetadata = zod.object({
   userId: zod.number().positive().int(),
   screen: zod.boolean(),
@@ -1007,88 +947,3 @@ export function useFullScreen<T extends Element>() {
     exit,
   };
 }
-
-/*
- * Send an HTTP request to retrieve the current members of a call
- */
-export function useFindSessionMembers(
-  sessionId: string | null
-): UseQueryResult<ISession.FindSessionMembersApiResponse | null, Error> {
-  const atlas = useAtlas();
-
-  const findCallMembers = useCallback(async () => {
-    if (!sessionId) return null;
-    return await atlas.session.findSessionMembers(sessionId);
-  }, [atlas.session, sessionId]);
-
-  return useQuery({
-    queryFn: findCallMembers,
-    queryKey: [QueryKey.FindCallMembers],
-  });
-}
-
-// a shorthand for some ServerEvent Callback type
-type CallEventsCallback = ServerEventsMap[ServerEvent.MemberJoinedSession];
-
-/*
- * Real-time call members state.
- */
-export function useSessionMembers(
-  sessionId: ISession.Id | null
-): number[] {
-  const [members, setMembers] = useState<number[]>([]);
-
-  const socket = useSocket();
-
-  // get the initial list by an http request
-  const query = useFindSessionMembers(sessionId);
-
-  useEffect(() => {
-    if (query.data && query.isFetching && query.isError) setMembers(query.data);
-  }, [query.data, query.isError, query.isFetching]);
-
-  // define WSS events callbacks
-  const onMemberJoinWssCallback: CallEventsCallback = useCallback((payload) => {
-    setMembers((prev) => [...prev, payload.userId]);
-  }, []);
-
-  const onMemberLeaveWssCallback: CallEventsCallback = useCallback(
-    (payload) => {
-      setMembers((prev) => prev.filter((id) => id !== payload.userId));
-    },
-    []
-  );
-
-  // define react callbacks
-  const joinSession = useCallback(() => {
-    if (!socket || !sessionId) return;
-    socket.emit(Wss.ClientEvent.JoinSession, { sessionId });
-  }, [socket, sessionId]);
-
-  const leaveSession = useCallback(() => {
-    if (!socket || !sessionId) return;
-    socket.emit(Wss.ClientEvent.LeaveSession, { sessionId });
-  }, [socket, sessionId]);
-
-  useEffect(() => {
-    // listen to wss events to modify members list accordingly
-    if (!socket) return;
-    socket.on(Wss.ServerEvent.MemberJoinedSession, onMemberJoinWssCallback);
-    socket.on(Wss.ServerEvent.MemberLeftSession, onMemberLeaveWssCallback);
-    joinSession();
-    return () => {
-      socket.off(Wss.ServerEvent.MemberJoinedSession);
-      socket.off(Wss.ServerEvent.MemberLeftSession);
-      leaveSession();
-    };
-  }, [
-    sessionId,
-    socket,
-    joinSession,
-    leaveSession,
-    onMemberLeaveWssCallback,
-    onMemberJoinWssCallback,
-  ]);
-
-  return members;
-}
diff --git a/packages/luna/src/locales/ar-eg.json b/packages/luna/src/locales/ar-eg.json
index a0ba2145f..64f589274 100644
--- a/packages/luna/src/locales/ar-eg.json
+++ b/packages/luna/src/locales/ar-eg.json
@@ -494,7 +494,6 @@
   "student-dashboard.overview.total-lessons": "اجمالي الحصص",
   "student-dashboard.overview.completed-lessons": "الحصص المكتملة",
   "student-dashboard.overview.total-learning-time": "اجمالي وقت التعلم",
-  "student-dashboard.overview.total-learning-time.unit.hour": "{value} س",
   "student-dashboard.overview.total-learning-time.unit.minute": "{value} د",
   "student-dashboard.overview.teachers": "عدد المعلمين",
   "student-dashboard.loading": "برجاء الانتظار... جاري تحميل بيانات لوحتك الرئيسية!",
@@ -718,4 +717,4 @@
   "error.password.short": "رقم سري قصير",
   "error.password.long": "رقم سري طويل",
   "error.password.invalid": "يجب أن يحتوي علي أرقام، حروف ، رموز"
-}
+}
\ No newline at end of file
diff --git a/packages/models/fixtures/db.ts b/packages/models/fixtures/db.ts
index 9a3698b95..a2693f43a 100644
--- a/packages/models/fixtures/db.ts
+++ b/packages/models/fixtures/db.ts
@@ -19,6 +19,7 @@ import {
   IUser,
   IRating,
   IMessage,
+  ISession,
 } from "@litespace/types";
 import { faker } from "@faker-js/faker/locale/ar";
 import { entries, range, sample } from "lodash";
diff --git a/packages/models/migrations/1716146586880_setup.js b/packages/models/migrations/1716146586880_setup.js
index 512734594..35a8cf5c1 100644
--- a/packages/models/migrations/1716146586880_setup.js
+++ b/packages/models/migrations/1716146586880_setup.js
@@ -98,34 +98,6 @@ exports.up = (pgm) => {
     updated_at: { type: "TIMESTAMP", notNull: true },
   });
 
-  pgm.createTable("calls", {
-    id: { type: "SERIAL", primaryKey: true, unique: true, notNull: true },
-    recording_status: {
-      type: "call_recording_status",
-      notNull: true,
-      default: "idle",
-    },
-    processing_time: { type: "INT", default: null },
-    created_at: { type: "TIMESTAMP", notNull: true },
-    updated_at: { type: "TIMESTAMP", notNull: true },
-  });
-
-  pgm.createTable(
-    "call_members",
-    {
-      call_id: { type: "SERIAL", notNull: true, references: "calls(id)" },
-      user_id: { type: "SERIAL", notNull: true, references: "users(id)" },
-    },
-    { constraints: { primaryKey: ["call_id", "user_id"] } }
-  );
-
-  pgm.createTable("call_events", {
-    call_id: { type: "SERIAL", notNull: true, references: "calls(id)" },
-    user_id: { type: "SERIAL", notNull: true, references: "users(id)" },
-    event_type: { type: "call_event", notNull: true },
-    created_at: { type: "TIMESTAMP", notNull: true },
-  });
-
   pgm.createTable("lessons", {
     id: { type: "SERIAL", primaryKey: true, notNull: true, unique: true },
     start: { type: "TIMESTAMP", notNull: true },
@@ -416,7 +388,7 @@ exports.down = (pgm) => {
   pgm.dropTable("lessons", { ifExists: true });
   pgm.dropTable("rules", { ifExists: true });
   pgm.dropTable("tutors", { ifExists: true });
-  pgm.dropTable("users", { ifExists: true });
+  pgm.dropTable("users", { ifExists: true, cascade: true });
 
   // types
   pgm.dropType("user_role", { ifExists: true });
diff --git a/packages/models/src/interviews.ts b/packages/models/src/interviews.ts
index cf07736ca..d21728a0e 100644
--- a/packages/models/src/interviews.ts
+++ b/packages/models/src/interviews.ts
@@ -220,7 +220,6 @@ export class Interviews {
         rule: row.rule_id,
         session: row.session_id,
       },
-      sessionId: row.session_id,
       feedback: {
         interviewer: row.interviewer_feedback,
         interviewee: row.interviewee_feedback,
diff --git a/packages/models/src/lessons.ts b/packages/models/src/lessons.ts
index c567d87fd..36f13ad86 100644
--- a/packages/models/src/lessons.ts
+++ b/packages/models/src/lessons.ts
@@ -196,36 +196,6 @@ export class Lessons {
     return rows.map((row) => this.asPopulatedMember(row));
   }
 
-  async findSessionMembers(
-    sessionId: string,
-    tx?: Knex.Transaction
-  ): Promise<ISession.PopuldatedMember[]> {
-    const select: Record<keyof ISession.PopuldatedMemberRow, string> = {
-      user_id: users.column("id"),
-      session_id: this.columns.lessons("session_id"),
-      name: users.column("name"),
-      image: users.column("image"),
-      role: users.column("role"),
-    };
-
-    const rows: ISession.PopuldatedMemberRow[] = await users
-      .builder(tx)
-      .select<ISession.PopuldatedMemberRow[]>(select)
-      .join(
-        this.table.members,
-        this.columns.members("user_id"),
-        users.column("id")
-      )
-      .join(
-        this.table.lessons,
-        this.columns.lessons("id"),
-        this.columns.members("lesson_id")
-      )
-      .where(this.columns.lessons("session_id"), sessionId)
-
-    return rows.map((row) => this.asSessionPopulatedMember(row));
-  }
-
   async findLessonsByMembers(
     members: number[],
     tx?: Knex.Transaction
diff --git a/packages/models/tests/cache/session.test.ts b/packages/models/tests/cache/session.test.ts
index 61b02cb6e..fb0337b3c 100644
--- a/packages/models/tests/cache/session.test.ts
+++ b/packages/models/tests/cache/session.test.ts
@@ -33,7 +33,7 @@ describe("Testing cache/session functions", () => {
     expect(res2).to.contains(3);
   });
 
-  it("should NOT add (duplicate) the same user to the same call twice", async () => {
+  it("should NOT add (duplicate) the same user to the same session twice", async () => {
     const sessionId = genSessionId("lesson");
     await cache.session.addMember({ sessionId, userId: 1 });
     await cache.session.addMember({ sessionId, userId: 1 });
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index b084bc005..4d9166a45 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -23,7 +23,6 @@ export * as IInvoice from "@/invoice";
 export * as IAsset from "@/asset";
 export * as ITopic from "@/topic";
 export * as Server from "@/server";
-export * as IPeer from "@/peer";
 export * from "@/api";
 export * from "@/utils";
 export * from "@/api";
diff --git a/packages/types/src/interview.ts b/packages/types/src/interview.ts
index b1f9a4565..a90ae0eae 100644
--- a/packages/types/src/interview.ts
+++ b/packages/types/src/interview.ts
@@ -1,5 +1,4 @@
-import { ISession, IFilter, IInterview, Paginated } from ".";
-import { InfiniteData, UseInfiniteQueryResult } from "@tanstack/react-query";
+import { ISession, IFilter } from ".";
 
 export enum Status {
   Pending = "pending",
@@ -23,11 +22,8 @@ export type Self = {
      */
     interviewee: number;
     rule: number;
-    session: ISession.Id; /** @deprecated */
+    session: ISession.Id;
   };
-  // sessionId has to be extracted from ids to be compatible with ILesson.Self 
-  // as ISession.Self is either a lesson.self or interview.self
-  sessionId: ISession.Id;
   /**
    * ISO UTC datetime.
    */
@@ -122,28 +118,3 @@ export type FindInterviewsApiQuery = IFilter.Pagination & {
   signed?: boolean;
   signers?: number[];
 };
-
-/**
- * @deprecated should be removed
- */
-export type FindPagedInterviewsProps = {
-  query: UseInfiniteQueryResult<
-    InfiniteData<
-      Paginated<{
-        interview: IInterview.Self;
-        session: ISession.Self;
-        members: ISession.PopuldatedMember[];
-      }>,
-      unknown
-    >,
-    Error
-  >;
-  list:
-    | {
-        interview: IInterview.Self;
-        session: ISession.Self;
-        members: ISession.PopuldatedMember[];
-      }[]
-    | null;
-  more: () => void;
-};
diff --git a/packages/types/src/peer.ts b/packages/types/src/peer.ts
deleted file mode 100644
index f63f14e5f..000000000
--- a/packages/types/src/peer.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export type RegisterPeerIdApiPayload = {
-  peer: string;
-  session?: string;
-};
-
-export type DeletePeerIdApiQurey = {
-  session?: string;
-};
-
-export enum PeerType {
-  Tutor = "tutor",
-  Ghost = "ghost",
-}
-
-export type FindPeerIdApiQuery =
-  | {
-      type: PeerType.Tutor;
-      tutor: number;
-    }
-  | {
-      type: PeerType.Ghost;
-      session: string; // has to be string so zod check can pass
-    };
-
-export type FindPeerIdApiResponse = {
-  peer: string | null;
-};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 512f39166..002971e24 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,7 +40,7 @@ importers:
         version: 5.0.10
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5)
+        version: 10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@4.9.5)
       vercel:
         specifier: ^34.2.7
         version: 34.4.0(@swc/core@1.9.3(@swc/helpers@0.5.13))
@@ -1210,6 +1210,9 @@ importers:
       rrule:
         specifier: ^2.8.1
         version: 2.8.1
+      uuid:
+        specifier: ^11.0.3
+        version: 11.0.3
       zod:
         specifier: ^3.23.8
         version: 3.23.8
@@ -1234,7 +1237,7 @@ importers:
         version: 5.1.2
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@22.10.1)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5))
+        version: 29.7.0(@types/node@20.17.9)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@20.17.9)(typescript@5.4.5))
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -1243,7 +1246,7 @@ importers:
         version: 0.13.0
       ts-jest:
         specifier: ^29.2.4
-        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@22.10.1)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5)))(typescript@5.4.5)
+        version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@20.17.9)(ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@20.17.9)(typescript@5.4.5)))(typescript@5.4.5)
       ts-patch:
         specifier: ^3.2.1
         version: 3.2.1
@@ -12126,6 +12129,10 @@ packages:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
 
+  uuid@11.0.3:
+    resolution: {integrity: sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==}
+    hasBin: true
+
   uuid@3.3.2:
     resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==}
     deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
@@ -19674,7 +19681,7 @@ snapshots:
       '@typescript-eslint/parser': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5)
       eslint: 9.16.0(jiti@1.21.6)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.16.0(jiti@1.21.6))
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
       eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6))
       eslint-plugin-jsx-a11y: 6.10.2(eslint@9.16.0(jiti@1.21.6))
       eslint-plugin-react: 7.37.2(eslint@9.16.0(jiti@1.21.6))
@@ -19722,13 +19729,13 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.16.0(jiti@1.21.6)):
+  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.3.7(supports-color@5.5.0)
       enhanced-resolve: 5.17.1
       eslint: 9.16.0(jiti@1.21.6)
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6))
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
       fast-glob: 3.3.2
       get-tsconfig: 4.8.1
       is-bun-module: 1.3.0
@@ -19752,14 +19759,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6)):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5)
       eslint: 9.16.0(jiti@1.21.6)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.16.0(jiti@1.21.6))
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
     transitivePeerDependencies:
       - supports-color
 
@@ -19803,7 +19810,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.16.0(jiti@1.21.6)
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.16.0(jiti@1.21.6))
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.4.5))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6)))(eslint@9.16.0(jiti@1.21.6))
       hasown: 2.0.2
       is-core-module: 2.15.1
       is-glob: 4.0.3
@@ -25342,6 +25349,26 @@ snapshots:
     optionalDependencies:
       '@swc/core': 1.9.3(@swc/helpers@0.5.13)
 
+  ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@4.9.5):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 22.10.1
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.9.5
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optionalDependencies:
+      '@swc/core': 1.9.3(@swc/helpers@0.5.13)
+
   ts-node@10.9.2(@swc/core@1.9.3(@swc/helpers@0.5.13))(@types/node@22.10.1)(typescript@5.4.5):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
@@ -25650,6 +25677,8 @@ snapshots:
 
   utils-merge@1.0.1: {}
 
+  uuid@11.0.3: {}
+
   uuid@3.3.2: {}
 
   uuid@7.0.3: {}
diff --git a/services/server/src/handlers/chat.ts b/services/server/src/handlers/chat.ts
index 94f0c3d41..297a1fcd0 100644
--- a/services/server/src/handlers/chat.ts
+++ b/services/server/src/handlers/chat.ts
@@ -154,43 +154,6 @@ async function findRoomByMembers(
   res.status(200).json({ room });
 }
 
-/**
- *  @deprecated You can find room by members
- */
-async function findSessionRoom(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isUser(user) || isGhost(user);
-  if (!allowed) return next(forbidden());
-
-  const { sessionId } = findSessionRoomParams.parse(req.params);
-  const sessionType = sessionId.split(":")[0];
-  const model = sessionType === "lesson" ? lessons : interviews;
-
-  const foundSession = await model.findBySessionId(asSessionId(sessionId));
-  if (!foundSession) return next(notfound.session());
-
-  const sessionMembers = await model.findSessionMembers(sessionId);
-  if (isEmpty(sessionMembers)) return next(notfound.session());
-
-  const memberIds = sessionMembers.map((member) => member.userId);
-  const isMember = isUser(user) && memberIds.includes(user.id);
-  const eligible = isMember || isAdmin(user) || isGhost(user);
-  if (!eligible) return next(forbidden());
-
-  const room = await rooms.findRoomByMembers(memberIds);
-  if (!room) return next(notfound.base());
-
-  const roomMembers = await rooms.findRoomMembers({ roomIds: [room] });
-  if (isEmpty(roomMembers)) return next(notfound.base());
-
-  const response: IRoom.FindSessionRoomApiResponse = {
-    room,
-    members: roomMembers,
-  } as const;
-
-  res.status(200).json(response);
-}
-
 async function findRoomMembers(
   req: Request,
   res: Response,
@@ -242,6 +205,5 @@ export default {
   findUserRooms: safeRequest(findUserRooms),
   findRoomByMembers: safeRequest(findRoomByMembers),
   findRoomMembers: safeRequest(findRoomMembers),
-  findSessionRoom: safeRequest(findSessionRoom),
   updateRoom: safeRequest(updateRoom),
 };
diff --git a/services/server/src/handlers/peer.ts b/services/server/src/handlers/peer.ts
deleted file mode 100644
index 836e3be1b..000000000
--- a/services/server/src/handlers/peer.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { cache } from "@/lib/cache";
-import { bad, forbidden } from "@/lib/error";
-import { id, sessionId, string } from "@/validation/utils";
-import { isGhost, isStudent, isTutor } from "@litespace/auth";
-import { IPeer } from "@litespace/types";
-import { NextFunction, Request, Response } from "express";
-import safeRequest from "express-async-handler";
-import zod from "zod";
-
-const registerPeerIdPayload = zod.object({
-  peer: string,
-  session: zod.optional(sessionId),
-});
-
-const deletePeerIdQuery = zod.object({
-  session: zod.optional(sessionId),
-});
-
-const findPeerIdApiQuery = zod.union([
-  zod.object({
-    type: zod.literal(IPeer.PeerType.Tutor),
-    tutor: id,
-  }),
-  zod.object({
-    type: zod.literal(IPeer.PeerType.Ghost),
-    session: sessionId,
-  }),
-]);
-
-/**
- * @deprecated should be removed in favor of registering the peer id using web sockets.
- */
-async function registerPeerId(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const ghost = isGhost(user);
-  const tutor = isTutor(user);
-  const allowed = ghost || tutor;
-  if (!allowed) return next(forbidden());
-
-  const { peer, session }: IPeer.RegisterPeerIdApiPayload =
-    registerPeerIdPayload.parse(req.body);
-  if (ghost && !session) return next(bad());
-  if (ghost && session) await cache.peer.setGhostPeerId(session, peer);
-  if (tutor) await cache.peer.setUserPeerId(user.id, peer);
-  res.status(200).send();
-}
-
-/**
- * @deprecated should be removed in favor of de-registering the peer id using web sockets.
- */
-async function deletePeerId(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const ghost = isGhost(user);
-  const tutor = isTutor(user);
-  const allowed = ghost || tutor;
-  if (!allowed) return next(forbidden());
-
-  const { session }: IPeer.DeletePeerIdApiQurey = deletePeerIdQuery.parse(
-    req.query
-  );
-  if (ghost && !session) return next(bad());
-  if (ghost && session) await cache.peer.removeGhostPeerId(session);
-  if (tutor) await cache.peer.removeUserPeerId(user.id);
-
-  res.status(200).send();
-}
-
-async function findPeerId(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isStudent(user) || isTutor(user);
-  if (!allowed) return next(forbidden());
-
-  const query: IPeer.FindPeerIdApiQuery = findPeerIdApiQuery.parse(req.query);
-  const peer =
-    query.type === IPeer.PeerType.Tutor
-      ? await cache.peer.getUserPeerId(query.tutor)
-      : await cache.peer.getGhostPeerId(query.session);
-
-  const response: IPeer.FindPeerIdApiResponse = { peer };
-  res.status(200).json(response);
-}
-
-export default {
-  registerPeerId: safeRequest(registerPeerId),
-  deletePeerId: safeRequest(deletePeerId),
-  findPeerId: safeRequest(findPeerId),
-};
diff --git a/services/server/src/handlers/session.ts b/services/server/src/handlers/session.ts
deleted file mode 100644
index 969f64e84..000000000
--- a/services/server/src/handlers/session.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { NextFunction, Request, Response } from "express";
-import safeRequest from "express-async-handler";
-import { forbidden, notfound } from "@/lib/error";
-import { isAdmin, isGhost, isUser } from "@litespace/auth";
-import { canJoinSession } from "@/lib/session";
-import { cache } from "@/lib/cache";
-import { ISession } from "@litespace/types";
-import zod from "zod";
-import { sessionId } from "@/validation/utils";
-import { interviews, lessons } from "@litespace/models";
-import { asSessionId } from "@litespace/sol";
-
-export const findSessionByIdParams = zod.object({ sessionId: sessionId });
-export const findSessionMembersParams = zod.object({ sessionId: sessionId });
-
-async function findSessionById(req: Request, res: Response, next: NextFunction) {
-  const user = req.user;
-  const allowed = isUser(user) || isGhost(user);
-  if (!allowed) return next(forbidden());
-
-  const { sessionId } = findSessionByIdParams.parse(req.params);
-  const sessionType = sessionId.split(":")[0]; // lesson or interview
-
-  const model = sessionType === "lesson" ? lessons : interviews;
-
-  const [session, members] = await Promise.all([
-    model.findBySessionId(asSessionId(sessionId)),
-    model.findSessionMembers(sessionId),
-  ]);
-  if (!session) return next(notfound.session());
-
-  const member =
-    isUser(user) && members.map((member) => member.userId).includes(user.id);
-  const eligible = member || isAdmin(req.user) || isGhost(user);
-  if (!eligible) next(forbidden());
-
-  res.status(200).json({ session, members });
-}
-
-async function findSessionMembers(
-  req: Request,
-  res: Response,
-  next: NextFunction
-) {
-  const user = req.user;
-  const allowed = isUser(user);
-  if (!allowed) return next(forbidden());
-
-  const { sessionId } = findSessionMembersParams.parse(req.params);
-
-  const canJoin = await canJoinSession({
-    userId: user.id,
-    sessionId,
-  });
-
-  const eligible = canJoin || isAdmin(user);
-  if (!eligible) return next(forbidden());
-
-  const members = await cache.session.getMembers(asSessionId(sessionId));
-  const response: ISession.FindSessionMembersApiResponse = members;
-  res.status(200).json(response);
-}
-
-export default {
-  findSessionById: safeRequest(findSessionById),
-  findSessionMembers: safeRequest(findSessionMembers),
-};
diff --git a/services/server/src/index.ts b/services/server/src/index.ts
index 8253c965a..7a04ea1c5 100644
--- a/services/server/src/index.ts
+++ b/services/server/src/index.ts
@@ -73,7 +73,6 @@ app.use(
 app.use("/api/v1/auth", routes.auth);
 app.use("/api/v1/user", routes.user(context));
 app.use("/api/v1/rule", routes.rule(context));
-app.use("/api/v1/session", routes.session);
 app.use("/api/v1/lesson", routes.lesson(context));
 app.use("/api/v1/interview", routes.interview);
 app.use("/api/v1/rating", routes.rating);
@@ -88,7 +87,6 @@ app.use("/api/v1/topic", routes.topic);
 app.use("/api/v1/withdraw-method/", routes.withdrawMethod);
 app.use("/api/v1/asset", routes.asset);
 app.use("/api/v1/cache", routes.cache);
-app.use("/api/v1/peer", routes.peer);
 app.use(errorHandler);
 
 server.listen(serverConfig.port, serverConfig.host, () =>
diff --git a/services/server/src/middleware/accessControl.ts b/services/server/src/middleware/accessControl.ts
deleted file mode 100644
index 8d9850d55..000000000
--- a/services/server/src/middleware/accessControl.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-import { IUser } from "@litespace/types";
-import UrlPattern from "url-pattern";
-import { isProduction } from "@/constants";
-import "colors";
-
-const owner = "owner";
-const authorized = "authorized";
-const unauthorized = "unauthorized";
-const superAdmin = IUser.Role.SuperAdmin;
-const regAdmin = IUser.Role.RegularAdmin;
-const tutorManager = IUser.Role.TutorManager;
-const tutor = IUser.Role.Tutor;
-const student = IUser.Role.Student;
-const provider = IUser.Role.Studio;
-
-export type Role = `${IUser.Role}` | "owner" | "unauthorized" | "authorized";
-export type Method = "POST" | "GET" | "PUT" | "DELETE";
-
-function roleMatch(requestRole: Role, policyRoles: Role[], isOwner?: boolean) {
-  const own = policyRoles.includes(owner) && !!isOwner;
-  const authorized =
-    policyRoles.includes("authorized") && requestRole !== "unauthorized";
-  const unauthorized = policyRoles.includes("unauthorized");
-  const exact = policyRoles.includes(requestRole);
-  return authorized || unauthorized || exact || own;
-}
-
-export function routeMatch(
-  url: string,
-  pattern: string,
-  ignore?: { key: string; value: string }
-): boolean {
-  const urlPattern = new UrlPattern(pattern);
-  const match = urlPattern.match(url) as Record<string, string> | null;
-  if (match === null) return false;
-  if (!ignore) return true;
-  return match[ignore.key] !== ignore.value;
-}
-
-function methodMatch(
-  requestMethod: Method,
-  policyMethods: Array<Method | "*">
-): boolean {
-  return policyMethods.includes(requestMethod) || policyMethods.includes("*");
-}
-
-type Policy = {
-  roles: Role[];
-  route: string;
-  methods: Array<Method | "*">;
-  ignore?: { key: string; value: string };
-};
-
-const policies: Array<Policy> = [
-  {
-    roles: [superAdmin],
-    route: "/*",
-    methods: ["*"],
-  },
-  {
-    roles: [authorized],
-    route: "/assets/*",
-    methods: ["GET"],
-  },
-  // use
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/user(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [tutor],
-    route: "(/)api/v1/user/interviewer/select(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, tutorManager],
-    route: "(/)api/v1/user/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/user/:id(/)",
-    methods: ["PUT"],
-    ignore: { key: "id", value: "me" },
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/user/me(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/user/tutor/meta/:tutorId(/)",
-    methods: ["GET"],
-  },
-  // tutors
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/tutor(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/tutor/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/tutor/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, tutor],
-    route: "(/)api/v1/tutor/:id(/)",
-    methods: ["DELETE"],
-  },
-  {
-    roles: [regAdmin, tutorManager, provider],
-    route: "(/)api/v1/tutor/media/*",
-    methods: ["GET"],
-  },
-  // coupons routes
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/coupon(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/coupon/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/coupon/code/:code(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/coupon/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/coupon/:id(/)",
-    methods: ["PUT", "DELETE"],
-  },
-  // invites routes
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/invite(/*)",
-    methods: ["*"],
-  },
-  // plans routes
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/plan(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/plan/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/plan/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/plan/:id(/)",
-    methods: ["PUT", "DELETE"],
-  },
-  // ratings routes
-  {
-    roles: [tutor, student],
-    route: "(/)api/v1/rating(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/rating/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/rating/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, owner],
-    route: "(/)api/v1/rating/list/rater/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [unauthorized],
-    route: "(/)api/v1/rating/list/ratee/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [owner],
-    route: "(/)api/v1/rating/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin, owner],
-    route: "(/)api/v1/rating/:id(/)",
-    methods: ["DELETE"],
-  },
-  // reports routes
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/:id(/)",
-    methods: ["DELETE"],
-  },
-  // report replies routes
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/reply/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "list" },
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply/report/:id(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/report/reply/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/report/reply/:id(/)",
-    methods: ["DELETE"],
-  },
-  // slots
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["GET"],
-    ignore: { key: "id", value: "me" },
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/me(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [authorized],
-    route: "(/)api/v1/slot/list/discrete/:userId(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["PUT"],
-  },
-  {
-    roles: [regAdmin, tutorManager, tutor],
-    route: "(/)api/v1/slot/:id(/)",
-    methods: ["DELETE"],
-  },
-  // sessions
-  {
-    roles: [student, tutor],
-    route: "(/)api/v1/session(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin, owner],
-    route: "(/)api/v1/session/tutor/interviews/:id(/)",
-    methods: ["GET"],
-  },
-  // interviews
-  {
-    roles: [tutor],
-    route: "(/)api/v1/interview(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [tutorManager, tutor],
-    route: "(/)api/v1/interview/list/:userId(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [owner],
-    route: "(/)api/v1/interview/:interviewId(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [owner],
-    route: "(/)api/v1/interview/:id(/)",
-    methods: ["PUT"],
-  },
-  // subscriptions
-  {
-    roles: [student],
-    route: "(/)api/v1/subscription(/)",
-    methods: ["POST"],
-  },
-  {
-    roles: [regAdmin],
-    route: "(/)api/v1/subscription/list(/)",
-    methods: ["GET"],
-  },
-  {
-    roles: [regAdmin, student],
-    route: "(/)api/v1/subscription/:id(/)",
-    methods: ["GET", "PUT", "DELETE"],
-  },
-];
-
-export function enforce(request: {
-  role: Role;
-  route: string;
-  method: Method;
-  isOwner?: boolean;
-}): boolean {
-  for (const policy of policies) {
-    if (
-      roleMatch(request.role, policy.roles, request.isOwner) &&
-      routeMatch(request.route, policy.route, policy.ignore) &&
-      methodMatch(request.method, policy.methods)
-    ) {
-      if (!isProduction)
-        console.log(
-          [
-            "Access Control: ",
-            ` ↳ Matched policy: ${policy.roles.join(
-              ", "
-            )} - ${policy.methods.join(", ")} - ${policy.route}`,
-            ` ↳ Request: ${request.role} - ${request.method} ${
-              request.route
-            } - owner(${!!request.isOwner})`,
-          ].join("\n").cyan
-        );
-      return true;
-    }
-  }
-
-  return false;
-}
diff --git a/services/server/src/routes/chat.ts b/services/server/src/routes/chat.ts
index a4050bf48..52441a9f6 100644
--- a/services/server/src/routes/chat.ts
+++ b/services/server/src/routes/chat.ts
@@ -8,7 +8,6 @@ router.get("/list/rooms/:userId", chat.findUserRooms);
 router.get("/list/:roomId/messages", chat.findRoomMessages);
 router.get("/room/by/members/", chat.findRoomByMembers);
 router.get("/room/members/:roomId", chat.findRoomMembers);
-router.get("/room/session/:sessionId", chat.findSessionRoom);
 router.put("/room/:roomId", chat.updateRoom);
 
 export default router;
diff --git a/services/server/src/routes/index.ts b/services/server/src/routes/index.ts
index 303b93b08..10e573794 100644
--- a/services/server/src/routes/index.ts
+++ b/services/server/src/routes/index.ts
@@ -1,5 +1,4 @@
 import user from "@/routes/user";
-import session from "@/routes/session";
 import interview from "@/routes/interview";
 import rating from "@/routes/rating";
 import chat from "@/routes/chat";
@@ -16,7 +15,6 @@ import withdrawMethod from "@/routes/withdrawMethod";
 import auth from "@/routes/auth";
 import topic from "@/routes/topic";
 import cache from "@/routes/cache";
-import peer from "@/routes/peer";
 
 export default {
   user,
@@ -24,7 +22,6 @@ export default {
   invoice,
   rule,
   withdrawMethod,
-  session,
   plan,
   chat,
   rating,
@@ -37,5 +34,4 @@ export default {
   auth,
   topic,
   cache,
-  peer,
 };
diff --git a/services/server/src/routes/peer.ts b/services/server/src/routes/peer.ts
deleted file mode 100644
index cb2ea150f..000000000
--- a/services/server/src/routes/peer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import peer from "@/handlers/peer";
-import { Router } from "express";
-
-const router = Router();
-
-router.post("/", peer.registerPeerId);
-router.delete("/", peer.deletePeerId);
-router.get("/", peer.findPeerId);
-
-export default router;
diff --git a/services/server/src/routes/session.ts b/services/server/src/routes/session.ts
deleted file mode 100644
index 947bebe29..000000000
--- a/services/server/src/routes/session.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Router } from "express";
-import session from "@/handlers/session";
-
-const router = Router();
-
-router.get("/:sessionId", session.findSessionById);
-router.get("/:sessionId/members", session.findSessionMembers);
-
-export default router;
diff --git a/services/server/src/wss/handlers/connection.ts b/services/server/src/wss/handlers/connection.ts
index b39dbb1ae..b696795de 100644
--- a/services/server/src/wss/handlers/connection.ts
+++ b/services/server/src/wss/handlers/connection.ts
@@ -70,6 +70,7 @@ export class Connection extends WssHandler {
     });
   }
 
+  // TODO: put some more thought on this function implementaion details
   private async joinRooms() {
     const error = await safe(async () => {
       const user = this.user;
diff --git a/services/server/src/wss/handlers/index.ts b/services/server/src/wss/handlers/index.ts
index 1159f4776..811d039a4 100644
--- a/services/server/src/wss/handlers/index.ts
+++ b/services/server/src/wss/handlers/index.ts
@@ -4,21 +4,18 @@ import { IUser } from "@litespace/types";
 import { Session } from "@/wss/handlers/session";
 import { Connection } from "@/wss/handlers/connection";
 import { Messages } from "@/wss/handlers/message";
-import { Peer } from "@/wss/handlers/peer";
 import { InputDevices } from "./inputDevices";
 
 export class WssHandlers {
   public readonly connection: Connection;
   public readonly session: Session;
   public readonly messages: Messages;
-  public readonly peer: Peer;
   public readonly inputDevices: InputDevices;
 
   constructor(socket: Socket, user: IUser.Self | IUser.Ghost) {
     this.connection = new Connection(socket, user).init();
     this.session = new Session(socket, user).init();
     this.messages = new Messages(socket, user).init();
-    this.peer = new Peer(socket, user);
     this.inputDevices = new InputDevices(socket, user).init();
   }
 }
diff --git a/services/server/src/wss/handlers/inputDevices.ts b/services/server/src/wss/handlers/inputDevices.ts
index 514517f5e..866e77763 100644
--- a/services/server/src/wss/handlers/inputDevices.ts
+++ b/services/server/src/wss/handlers/inputDevices.ts
@@ -4,6 +4,7 @@ import { Wss } from "@litespace/types";
 import { boolean, sessionId } from "@/validation/utils";
 import { WssHandler } from "@/wss/handlers/base";
 import zod from "zod";
+import { asSessionRoomId } from "../utils";
 
 const toggleCameraPayload = zod.object({ session: sessionId, camera: boolean });
 const toggleMicPayload = zod.object({ session: sessionId, mic: boolean });
@@ -26,10 +27,11 @@ export class InputDevices extends WssHandler {
       if (isGhost(user)) return;
       const { session, camera } = toggleCameraPayload.parse(data);
       // todo: add validation
-      this.broadcast(Wss.ServerEvent.CameraToggled, session, {
-        user: user.id,
-        camera,
-      });
+      this.broadcast(
+        Wss.ServerEvent.CameraToggled, 
+        asSessionRoomId(session), 
+        { user: user.id, camera }
+      );
     });
     if (error instanceof Error) stdout.error(error.message);
   }
@@ -40,10 +42,11 @@ export class InputDevices extends WssHandler {
       if (isGhost(user)) return;
       const { session, mic } = toggleMicPayload.parse(data);
       // todo: add validation
-      this.broadcast(Wss.ServerEvent.MicToggled, session, {
-        user: user.id,
-        mic,
-      });
+      this.broadcast(
+        Wss.ServerEvent.MicToggled, 
+        asSessionRoomId(session),
+        { user: user.id, mic }
+      );
     });
     if (error instanceof Error) stdout.error(error.message);
   }
diff --git a/services/server/src/wss/handlers/peer.ts b/services/server/src/wss/handlers/peer.ts
deleted file mode 100644
index 3b8667ef8..000000000
--- a/services/server/src/wss/handlers/peer.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { asSessionId, logger, safe } from "@litespace/sol";
-import { isGhost, isTutor, isUser } from "@litespace/auth";
-import { Wss } from "@litespace/types";
-import { getGhostSession } from "@litespace/sol/ghost";
-import { cache } from "@/lib/cache";
-import { sessionId, string } from "@/validation/utils";
-import { WssHandler } from "@/wss/handlers/base";
-import zod from "zod";
-import { isEmpty } from "lodash";
-
-const peerPayload = zod.object({ sessionId: sessionId, peerId: string });
-const registerPeerPayload = zod.object({ peer: zod.string() });
-
-const stdout = logger("wss");
-
-/**
- * @deprecated should be removed in favor of the new call-cache-based design.
- */
-export class Peer extends WssHandler {
-  async peerOpened(data: unknown) {
-    const error = await safe(async () => {
-      const { sessionId, peerId } = peerPayload.parse(data);
-      const user = this.user;
-
-      const memberIds = await cache.session.getMembers(asSessionId(sessionId));
-      if (isEmpty(memberIds)) return;
-
-      const isMember = isUser(user) && memberIds.includes(user.id);
-      const allowed = isMember || isGhost(this.user);
-      if (!allowed) return;
-
-      this.socket.join(sessionId);
-      this.socket
-        .to(sessionId)
-        .emit(Wss.ServerEvent.UserJoinedSession, { peerId });
-    });
-    if (error instanceof Error) stdout.error(error.message);
-  }
-
-  async registerPeer(data: unknown) {
-    const result = await safe(async () => {
-      const { peer } = registerPeerPayload.parse(data);
-      const user = this.user;
-      const id = isGhost(user) ? user : user.email;
-      stdout.info(`Register peer: ${peer} for ${id}`);
-
-      if (isGhost(user))
-        await cache.peer.setGhostPeerId(getGhostSession(user), peer);
-      if (isTutor(user)) await cache.peer.setUserPeerId(user.id, peer);
-
-      // notify peers to refetch the peer id if needed
-    });
-    if (result instanceof Error) stdout.error(result.message);
-  }
-}
diff --git a/services/server/tests/wss/call.test.ts b/services/server/tests/wss/session.test.ts
similarity index 90%
rename from services/server/tests/wss/call.test.ts
rename to services/server/tests/wss/session.test.ts
index 06a52d767..570442a4e 100644
--- a/services/server/tests/wss/call.test.ts
+++ b/services/server/tests/wss/session.test.ts
@@ -10,7 +10,7 @@ import { unpackRules } from "@litespace/sol/rule";
 import { expect } from "chai";
 import { cache } from "@/lib/cache";
 
-describe("calls test suite", () => {
+describe("sessions test suite", () => {
   let tutor: IUser.LoginApiResponse;
   let student: IUser.LoginApiResponse;
 
@@ -74,21 +74,21 @@ describe("calls test suite", () => {
 
     const { userId } = await studentResult;
 
-    const callMembersIds = await cache.session.getMembers(lesson.sessionId);
-    expect(callMembersIds).to.be.of.length(1);
-    expect(callMembersIds[0]).to.be.eq(tutor.user.id);
+    const sessionMembersIds = await cache.session.getMembers(lesson.sessionId);
+    expect(sessionMembersIds).to.be.of.length(1);
+    expect(sessionMembersIds[0]).to.be.eq(tutor.user.id);
     expect(userId).to.be.eq(tutor.user.id);
 
     const tutorResult = tutorSocket.wait(Wss.ServerEvent.MemberJoinedSession);
     studentSocket.joinSession(lesson.sessionId);
 
     const { userId: studentId } = await tutorResult;
-    const callMembersIdsSecondSnapshot = await cache.session.getMembers(
+    const sessionMembersIdsSecondSnapshot = await cache.session.getMembers(
       lesson.sessionId
     );
-    expect(callMembersIdsSecondSnapshot).to.be.of.length(2);
+    expect(sessionMembersIdsSecondSnapshot).to.be.of.length(2);
     expect(
-      callMembersIdsSecondSnapshot.map((memberId) => memberId)
+      sessionMembersIdsSecondSnapshot.map((memberId) => memberId)
     ).to.be.members([student.user.id, tutor.user.id]);
 
     expect(studentId).to.be.eq(student.user.id);
@@ -143,7 +143,7 @@ describe("calls test suite", () => {
     studentSocket.client.disconnect();
   });
 
-  it("should NOT broadcast when user tries to join a call before its start", async () => {
+  it("should NOT broadcast when user tries to join a session before its start", async () => {
     const now = dayjs();
     const rule = await tutorApi.atlas.rule.create({
       start: now.add(1, "day").utc().startOf("day").toISOString(),