diff --git a/src/authz-module/libraries-manager/ErrorPage/index.test.tsx b/src/authz-module/components/ErrorPage/index.test.tsx
similarity index 73%
rename from src/authz-module/libraries-manager/ErrorPage/index.test.tsx
rename to src/authz-module/components/ErrorPage/index.test.tsx
index 06ac6db1..93c42cb3 100644
--- a/src/authz-module/libraries-manager/ErrorPage/index.test.tsx
+++ b/src/authz-module/components/ErrorPage/index.test.tsx
@@ -2,68 +2,68 @@ import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ErrorBoundary } from 'react-error-boundary';
 import { renderWrapper } from '@src/setupTest';
-import LibrariesErrorFallback from './index';
+import ErrorFallback from './index';
 
 const ThrowError = ({ error }: { error:Error }) => {
   throw error;
   return null;
 };
 
-describe('LibrariesErrorFallback', () => {
+describe('ErrorFallback', () => {
   it('renders Access Denied for 401', () => {
     const error = { name: '', message: 'NO_ACCESS', customAttributes: { httpErrorStatus: 401 } };
     renderWrapper(
-      <ErrorBoundary FallbackComponent={LibrariesErrorFallback}>
+      <ErrorBoundary FallbackComponent={ErrorFallback}>
         <ThrowError error={error} />
       </ErrorBoundary>,
     );
     expect(screen.getByText(/Access Denied/i)).toBeInTheDocument();
-    expect(screen.getByText(/Back to Libraries/i)).toBeInTheDocument();
+    expect(screen.getByText(/Back to Studio/i)).toBeInTheDocument();
   });
 
   it('renders Not Found for 400 error', () => {
     const error = { name: '', message: 'Axios Error (Response): 400', customAttributes: { httpErrorStatus: 400 } };
     renderWrapper(
-      <ErrorBoundary FallbackComponent={LibrariesErrorFallback}>
+      <ErrorBoundary FallbackComponent={ErrorFallback}>
         <ThrowError error={error} />
       </ErrorBoundary>,
     );
     expect(screen.getByText(/Page Not Found/i)).toBeInTheDocument();
-    expect(screen.getByText(/Back to Libraries/i)).toBeInTheDocument();
+    expect(screen.getByText(/Back to Studio/i)).toBeInTheDocument();
   });
 
   it('renders Not Found for 404', () => {
     const error = { name: '', message: 'NOT_FOUND', customAttributes: { httpErrorStatus: 404 } };
     renderWrapper(
-      <ErrorBoundary FallbackComponent={LibrariesErrorFallback}>
+      <ErrorBoundary FallbackComponent={ErrorFallback}>
         <ThrowError error={error} />
       </ErrorBoundary>,
     );
     expect(screen.getByText(/Page Not Found/i)).toBeInTheDocument();
-    expect(screen.getByText(/Back to Libraries/i)).toBeInTheDocument();
+    expect(screen.getByText(/Back to Studio/i)).toBeInTheDocument();
   });
 
   it('renders Server Error for 500 and shows reload', async () => {
     const error = { name: '', message: 'SERVER_ERROR', customAttributes: { httpErrorStatus: 500 } };
     renderWrapper(
-      <ErrorBoundary FallbackComponent={LibrariesErrorFallback}>
+      <ErrorBoundary FallbackComponent={ErrorFallback}>
         <ThrowError error={error} />
       </ErrorBoundary>,
     );
     expect(screen.getByText(/Something went wrong/i)).toBeInTheDocument();
     expect(screen.getByText(/Reload Page/i)).toBeInTheDocument();
-    expect(screen.getByText(/Back to Libraries/i)).toBeInTheDocument();
+    expect(screen.getByText(/Back to Studio/i)).toBeInTheDocument();
   });
 
   it('renders generic error for other error error', () => {
     const error = { name: '', message: 'SOMETHING_ELSE', customAttributes: { httpErrorStatus: 418 } };
     renderWrapper(
-      <ErrorBoundary FallbackComponent={LibrariesErrorFallback}>
+      <ErrorBoundary FallbackComponent={ErrorFallback}>
         <ThrowError error={error} />
       </ErrorBoundary>,
     );
     expect(screen.getByText(/Error/i)).toBeInTheDocument();
-    expect(screen.getByText(/Back to Libraries/i)).toBeInTheDocument();
+    expect(screen.getByText(/Back to Studio/i)).toBeInTheDocument();
   });
 
   it('calls reload action if present', async () => {
@@ -73,7 +73,7 @@ describe('LibrariesErrorFallback', () => {
       name: '', message: 'SERVER_ERROR', customAttributes: { httpErrorStatus: 500 }, refetch,
     };
     renderWrapper(
-      <ErrorBoundary FallbackComponent={LibrariesErrorFallback} onReset={refetch}>
+      <ErrorBoundary FallbackComponent={ErrorFallback} onReset={refetch}>
         <ThrowError error={error} />
       </ErrorBoundary>,
     );
diff --git a/src/authz-module/libraries-manager/ErrorPage/index.tsx b/src/authz-module/components/ErrorPage/index.tsx
similarity index 95%
rename from src/authz-module/libraries-manager/ErrorPage/index.tsx
rename to src/authz-module/components/ErrorPage/index.tsx
index e93a7d7f..263865a7 100644
--- a/src/authz-module/libraries-manager/ErrorPage/index.tsx
+++ b/src/authz-module/components/ErrorPage/index.tsx
@@ -80,7 +80,7 @@ const ErrorPage = ({ error, resetErrorBoundary }: FallbackProps) => {
         {showBackButton && (
         <Button
           as={Hyperlink}
-          destination={`${getConfig().COURSE_AUTHORING_MICROFRONTEND_URL}/libraries`}
+          destination={`${getConfig().COURSE_AUTHORING_MICROFRONTEND_URL}`}
           className="m-2"
           variant={showReloadButton ? 'outline-primary' : 'primary'}
         >
@@ -93,5 +93,5 @@ const ErrorPage = ({ error, resetErrorBoundary }: FallbackProps) => {
   );
 };
 
-const LibrariesErrorFallback = (props: FallbackProps) => <ErrorPage {...props} />;
-export default LibrariesErrorFallback;
+const ErrorFallback = (props: FallbackProps) => <ErrorPage {...props} />;
+export default ErrorFallback;
diff --git a/src/authz-module/libraries-manager/ErrorPage/messages.ts b/src/authz-module/components/ErrorPage/messages.ts
similarity index 91%
rename from src/authz-module/libraries-manager/ErrorPage/messages.ts
rename to src/authz-module/components/ErrorPage/messages.ts
index 9d86ff5b..1d470f92 100644
--- a/src/authz-module/libraries-manager/ErrorPage/messages.ts
+++ b/src/authz-module/components/ErrorPage/messages.ts
@@ -18,7 +18,7 @@ const messages = defineMessages({
   },
   'error.page.message.notFound': {
     id: 'error.page.message.notFound',
-    defaultMessage: 'The library you are looking for could not be found.',
+    defaultMessage: 'The resource you are looking for could not be found.',
     description: 'Error message when the resource is not found',
   },
   'error.page.title.server': {
@@ -48,8 +48,8 @@ const messages = defineMessages({
   },
   'error.page.action.back': {
     id: 'error.page.action.back',
-    defaultMessage: 'Back to Libraries',
-    description: 'Label for return to libraries action',
+    defaultMessage: 'Back to Studio',
+    description: 'Label for return to Studio action',
   },
 });
 
diff --git a/src/authz-module/constants.ts b/src/authz-module/constants.ts
index be3e6a6c..9213e2f5 100644
--- a/src/authz-module/constants.ts
+++ b/src/authz-module/constants.ts
@@ -530,8 +530,6 @@ export const SKELETON_ROWS = Array.from({ length: 10 }).map(() => ({
 
 export const ROUTES = {
   HOME_PATH: '/authz',
-  LIBRARIES_TEAM_PATH: '/libraries/:libraryId',
-  LIBRARIES_USER_PATH: '/libraries/:libraryId/:username',
   AUDIT_USER_PATH: '/user/:username',
   ASSIGN_ROLE_WIZARD_PATH: '/assign-role',
 };
diff --git a/src/authz-module/index.test.tsx b/src/authz-module/index.test.tsx
index 5b051560..82f97393 100644
--- a/src/authz-module/index.test.tsx
+++ b/src/authz-module/index.test.tsx
@@ -1,22 +1,11 @@
-import { ComponentType, lazy } from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
-import { MemoryRouter, Outlet } from 'react-router-dom';
+import { MemoryRouter } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { initializeMockApp } from '@edx/frontend-platform/testing';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { CustomErrors } from '@src/constants';
 import AuthZModule from './index';
 
-jest.mock('./libraries-manager', () => ({
-  // eslint-disable-next-line no-promise-executor-return
-  LibrariesLayout: lazy(() => new Promise<{ default: ComponentType<any> }>(resolve => setTimeout(
-    () => resolve({ default: () => <div><Outlet /></div> }),
-    100,
-  ))),
-  LibrariesTeamManager: () => <div>Libraries Team Page</div>,
-  LibrariesUserManager: () => <div>Libraries User Page</div>,
-}));
-
 const createTestQueryClient = () => new QueryClient({
   defaultOptions: {
     queries: {
@@ -32,44 +21,6 @@ describe('AuthZModule', () => {
       authenticatedUser: { username: 'testuser' },
     });
   });
-  it('renders LoadingPage then LibrariesTeamManager when route matches', async () => {
-    const queryClient = createTestQueryClient();
-    const path = '/libraries/lib:123';
-
-    render(
-      <IntlProvider locale="en">
-        <QueryClientProvider client={queryClient}>
-          <MemoryRouter initialEntries={[path]}>
-            <AuthZModule />
-          </MemoryRouter>
-        </QueryClientProvider>
-      </IntlProvider>,
-    );
-
-    expect(document.querySelector('.spinner-border')).toBeInTheDocument();
-
-    await waitFor(() => {
-      expect(screen.getByText('Libraries Team Page')).toBeInTheDocument();
-    });
-  });
-
-  it('renders LoadingPage then LibrariesUserManager when user route matches', async () => {
-    const queryClient = createTestQueryClient();
-    const path = '/libraries/lib:123/testuser';
-
-    render(
-      <IntlProvider locale="en">
-        <QueryClientProvider client={queryClient}>
-          <MemoryRouter initialEntries={[path]}>
-            <AuthZModule />
-          </MemoryRouter>
-        </QueryClientProvider>
-      </IntlProvider>,
-    );
-    await waitFor(() => {
-      expect(screen.getByText('Libraries User Page')).toBeInTheDocument();
-    });
-  });
 
   it('renders error boundary fallback when accessing unknown route', async () => {
     const queryClient = createTestQueryClient();
diff --git a/src/authz-module/index.tsx b/src/authz-module/index.tsx
index 350e411d..ce9b33f0 100644
--- a/src/authz-module/index.tsx
+++ b/src/authz-module/index.tsx
@@ -3,10 +3,9 @@ import { Routes, Route } from 'react-router-dom';
 import { ErrorBoundary } from 'react-error-boundary';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import LoadingPage from '@src/components/LoadingPage';
-import LibrariesErrorFallback from '@src/authz-module/libraries-manager/ErrorPage';
+import ErrorFallback from '@src/authz-module/components/ErrorPage';
 import { CustomErrors } from '@src/constants';
 import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
-import { LibrariesUserManager, LibrariesLayout, LibrariesTeamManager } from './libraries-manager';
 import AuthzHome from './authz-home';
 import AuditUserPage from './audit-user';
 import AssignRoleWizardPage from './role-assignation-wizard/AssignRoleWizardPage';
@@ -22,19 +21,12 @@ const NotFoundError = () => {
 const AuthZModule = () => (
   <QueryErrorResetBoundary>
     {({ reset }) => (
-      <ErrorBoundary fallbackRender={LibrariesErrorFallback} onReset={reset}>
+      <ErrorBoundary fallbackRender={ErrorFallback} onReset={reset}>
         <ToastManagerProvider>
           <Suspense fallback={<LoadingPage />}>
             <Routes>
-              <Route element={<LibrariesLayout />}>
-                <Route path={ROUTES.LIBRARIES_USER_PATH} element={<LibrariesUserManager />} />
-                <Route path={ROUTES.LIBRARIES_TEAM_PATH} element={<LibrariesTeamManager />} />
-              </Route>
               <Route index element={<AuthzHome />} />
-              <Route
-                path={ROUTES.AUDIT_USER_PATH}
-                element={<AuditUserPage />}
-              />
+              <Route path={ROUTES.AUDIT_USER_PATH} element={<AuditUserPage />} />
               <Route path={ROUTES.ASSIGN_ROLE_WIZARD_PATH} element={<AssignRoleWizardPage />} />
               <Route path="*" element={<NotFoundError />} />
             </Routes>
diff --git a/src/authz-module/libraries-manager/LibrariesTeamManager.test.tsx b/src/authz-module/libraries-manager/LibrariesTeamManager.test.tsx
deleted file mode 100644
index a7704b33..00000000
--- a/src/authz-module/libraries-manager/LibrariesTeamManager.test.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { screen, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { initializeMockApp } from '@edx/frontend-platform/testing';
-import { useLibrary } from '@src/authz-module/data/hooks';
-import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
-import { useLibraryAuthZ } from './context';
-import LibrariesTeamManager from './LibrariesTeamManager';
-import { CONTENT_LIBRARY_PERMISSIONS } from '../constants';
-
-jest.mock('./context', () => {
-  const actual = jest.requireActual('./context');
-  return {
-    ...actual,
-    useLibraryAuthZ: jest.fn(),
-    LibraryAuthZProvider: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  };
-});
-
-const mockedUseLibraryAuthZ = useLibraryAuthZ as jest.Mock;
-
-jest.mock('@src/authz-module/data/hooks', () => ({
-  useLibrary: jest.fn(),
-}));
-
-jest.mock('./components/TeamTable', () => ({
-  __esModule: true,
-  default: () => <div role="table" aria-label="Team Members Table">Team member list</div>,
-}));
-
-jest.mock('../components/RoleCard', () => ({
-  __esModule: true,
-  default: ({ title, description, permissionsByResource }: {
-    title: string,
-    description: string,
-    permissionsByResource: any[]
-  }) => (
-    <div role="article" aria-label={`Role: ${title}`}>
-      <h3>{title}</h3>
-      <p>{description}</p>
-      <span>{permissionsByResource.length} permissions</span>
-    </div>
-  ),
-}));
-
-const renderTeamManager = () => renderWrapper(<ToastManagerProvider><LibrariesTeamManager /></ToastManagerProvider>);
-describe('LibrariesTeamManager', () => {
-  const libraryData = {
-    id: 'lib-001',
-    title: 'Test Library',
-    org: 'Test Org',
-    allowPublicRead: false,
-  };
-  const libraryAuthZContext = {
-    libraryId: libraryData.id,
-    libraryName: libraryData.title,
-    libraryOrg: libraryData.org,
-    username: 'mockuser',
-    roles: [
-      {
-        name: 'Instructor',
-        description: 'Can manage content.',
-        userCount: 3,
-        permissions: ['view', 'edit'],
-      },
-    ],
-    permissions: [
-      { key: CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY, label: 'view', resource: 'library' },
-      { key: CONTENT_LIBRARY_PERMISSIONS.EDIT_LIBRARY_COLLECTION, label: 'edit', resource: 'library' },
-    ],
-    resources: [{ key: 'library', label: 'Library' }],
-    canManageTeam: true,
-  };
-
-  beforeEach(() => {
-    initializeMockApp({
-      authenticatedUser: {
-        username: 'admin',
-      },
-    });
-    jest.resetAllMocks();
-    mockedUseLibraryAuthZ.mockReturnValue(libraryAuthZContext);
-
-    (useLibrary as jest.Mock).mockReturnValue({
-      data: libraryData,
-    });
-  });
-
-  it('renders tabs and layout content correctly', () => {
-    renderTeamManager();
-    // Tabs
-    expect(screen.getByRole('tab', { name: /Team Members/i })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: /Roles/i })).toBeInTheDocument();
-    expect(screen.getByRole('tab', { name: /Permissions/i })).toBeInTheDocument();
-
-    // Breadcrumb/page title
-    expect(screen.getByText('Manage Access')).toBeInTheDocument(); // from intl.formatMessage
-    expect(screen.getByText('lib-001')).toBeInTheDocument(); // subtitle
-
-    // TeamTable is rendered
-    expect(screen.getByRole('table', { name: 'Team Members Table' })).toBeInTheDocument();
-
-    // Assign Role wizard button is rendered
-    expect(screen.getByRole('button', { name: /Assign Role/i })).toBeInTheDocument();
-  });
-
-  it('renders role cards when "Roles" tab is selected', async () => {
-    const user = userEvent.setup();
-
-    renderTeamManager();
-
-    // Click on "Roles" tab
-    const rolesTab = await screen.findByRole('tab', { name: /roles/i });
-    await user.click(rolesTab);
-
-    const roleCards = await screen.findAllByRole('article', { name: /Role:/ });
-    const rolesScope = within(roleCards[0]);
-    expect(roleCards.length).toBe(1);
-    expect(rolesScope.getByRole('heading', { name: 'Instructor' })).toBeInTheDocument();
-    expect(screen.getByText(/Can manage content/i)).toBeInTheDocument();
-    expect(screen.getByText(/1 permissions/i)).toBeInTheDocument();
-  });
-
-  it('renders role matrix when "Permissions" tab is selected', async () => {
-    const user = userEvent.setup();
-
-    renderTeamManager();
-
-    // Click on "Permissions" tab
-    const permissionsTab = await screen.findByRole('tab', { name: /permissions/i });
-    await user.click(permissionsTab);
-
-    const tablePermissionMatrix = await screen.getByRole('table');
-    const matrixScope = within(tablePermissionMatrix);
-
-    expect(matrixScope.getByText('Library')).toBeInTheDocument();
-    expect(matrixScope.getByText('Instructor')).toBeInTheDocument();
-    expect(matrixScope.getByText('edit')).toBeInTheDocument();
-    expect(matrixScope.getByText('view')).toBeInTheDocument();
-  });
-
-  it('renders correct navigation link label and URL on breadcrumb', () => {
-    renderTeamManager();
-    const navLink = screen.getByRole('link', { name: 'Manage Access' });
-    expect(navLink).toBeInTheDocument();
-    // TODO: Update expected URL when dedicated Manage Access page is created
-    expect(navLink).toHaveAttribute('href', '/authz/libraries/lib-001');
-  });
-});
diff --git a/src/authz-module/libraries-manager/LibrariesTeamManager.tsx b/src/authz-module/libraries-manager/LibrariesTeamManager.tsx
deleted file mode 100644
index 5131e1e9..00000000
--- a/src/authz-module/libraries-manager/LibrariesTeamManager.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useMemo } from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  Container, Skeleton, Tab, Tabs,
-} from '@openedx/paragon';
-import { useLibrary } from '@src/authz-module/data/hooks';
-import { useLocation } from 'react-router-dom';
-import { ROUTES } from '@src/authz-module/constants';
-import AddRoleButton from '@src/authz-module/components/AddRoleButton';
-import TeamTable from './components/TeamTable';
-import AuthZLayout from '../components/AuthZLayout';
-import RoleCard from '../components/RoleCard';
-import PermissionTable from '../components/PermissionTable';
-import { useLibraryAuthZ } from './context';
-import { buildPermissionMatrixByResource, buildPermissionMatrixByRole } from './utils';
-
-import messages from './messages';
-
-const LibrariesTeamManager = () => {
-  const intl = useIntl();
-  const { hash, pathname } = useLocation();
-  const {
-    libraryId, canManageTeam, roles, permissions, resources,
-  } = useLibraryAuthZ();
-  const { data: library } = useLibrary(libraryId);
-  const rootBreadcrumb = intl.formatMessage(messages['library.authz.breadcrumb.root']) || '';
-  const pageTitle = intl.formatMessage(messages['library.authz.manage.page.title']);
-  const teamMembersPath = `/authz${ROUTES.LIBRARIES_TEAM_PATH.replace(':libraryId', libraryId)}`;
-
-  const [libraryPermissionsByRole, libraryPermissionsByResource] = useMemo(() => {
-    if (!roles && !permissions && !resources) { return [null, null]; }
-    const permissionsByRole = buildPermissionMatrixByRole({
-      roles, permissions, resources, intl,
-    });
-    const permissionsByResource = buildPermissionMatrixByResource({
-      roles, permissions, resources, intl,
-    });
-
-    return [permissionsByRole, permissionsByResource];
-  }, [roles, permissions, resources, intl]);
-
-  return (
-    <div className="authz-module">
-      <AuthZLayout
-        context={{ id: libraryId, title: library.title, org: library.org }}
-        // Temporarily setting '/authz/libraries/:libraryId' as the URL for Manage Access breadcrumb for now as
-        // currently we do not have a dedicated page. TODO: Update when such page is created.
-        navLinks={[{ label: rootBreadcrumb, to: teamMembersPath }]}
-        activeLabel={pageTitle}
-        pageTitle={pageTitle}
-        pageSubtitle={libraryId}
-        actions={
-          [
-            ...(canManageTeam ? [
-              <AddRoleButton from={pathname} />,
-            ] : []),
-          ]
-        }
-      >
-        <Tabs
-          variant="tabs"
-          defaultActiveKey={hash ? 'permissions' : 'team'}
-          className="bg-light-100 px-5"
-        >
-          <Tab eventKey="team" title={intl.formatMessage(messages['library.authz.tabs.team'])} className="p-5">
-            <TeamTable />
-          </Tab>
-          <Tab eventKey="roles" title={intl.formatMessage(messages['library.authz.tabs.roles'])}>
-            <Container className="p-5">
-              {!libraryPermissionsByRole ? <Skeleton count={2} height={200} />
-                : libraryPermissionsByRole.map(role => (
-                  <RoleCard
-                    key={`${role.role}-description`}
-                    title={role.name}
-                    userCounter={role.userCount}
-                    description={role.description}
-                    permissionsByResource={role.resources as any[]}
-                  />
-                ))}
-            </Container>
-          </Tab>
-          <Tab id="libraries-permissions-tab" eventKey="permissions" title={intl.formatMessage(messages['library.authz.tabs.permissions'])}>
-            <Container className="p-5 container-mw-lg">
-              {!libraryPermissionsByResource ? <Skeleton count={2} height={200} />
-                : <PermissionTable permissionsTable={libraryPermissionsByResource} roles={roles} />}
-            </Container>
-          </Tab>
-        </Tabs>
-      </AuthZLayout>
-    </div>
-  );
-};
-
-export default LibrariesTeamManager;
diff --git a/src/authz-module/libraries-manager/LibrariesUserManager.test.tsx b/src/authz-module/libraries-manager/LibrariesUserManager.test.tsx
deleted file mode 100644
index b465a6ee..00000000
--- a/src/authz-module/libraries-manager/LibrariesUserManager.test.tsx
+++ /dev/null
@@ -1,514 +0,0 @@
-import { useParams } from 'react-router-dom';
-import { screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
-import { buildWizardPath } from '@src/authz-module/constants';
-import LibrariesUserManager from './LibrariesUserManager';
-import { useLibraryAuthZ } from './context';
-import { useLibrary, useTeamMembers, useRevokeUserRoles } from '../data/hooks';
-
-jest.mock('@edx/frontend-platform/logging', () => ({
-  logError: jest.fn(),
-}));
-
-const mockNavigate = jest.fn();
-
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useParams: jest.fn(),
-  useNavigate: jest.fn(),
-  useLocation: jest.fn(),
-}));
-
-jest.mock('./context', () => ({
-  useLibraryAuthZ: jest.fn(),
-}));
-
-jest.mock('../data/hooks', () => ({
-  useLibrary: jest.fn(),
-  useTeamMembers: jest.fn(),
-  useRevokeUserRoles: jest.fn(),
-}));
-
-jest.mock('../components/RoleCard', () => ({
-  __esModule: true,
-  default: ({
-    title,
-    description,
-    handleDelete,
-  }: {
-    title: string;
-    description: string;
-    handleDelete?: () => void;
-  }) => (
-    <div>
-      <div>{title}</div>
-      <div>{description}</div>
-      {handleDelete && (
-        <button type="button" onClick={handleDelete}>
-          {`delete-role-${title}`}
-        </button>
-      )}
-    </div>
-  ),
-}));
-
-jest.mock('./components/AssignNewRoleModal', () => ({
-  AssignNewRoleTrigger: () => <button type="button">Assign Role</button>,
-}));
-
-describe('LibrariesUserManager', () => {
-  const mockMutate = jest.fn();
-  const defaultMockData = {
-    libraryId: 'lib:123',
-    permissions: [{ key: 'view' }, { key: 'reuse' }],
-    roles: [
-      {
-        role: 'admin',
-        name: 'Admin',
-        description: 'Administrator Role',
-        permissions: ['view', 'reuse'],
-        userCount: 5,
-      },
-      {
-        role: 'instructor',
-        name: 'Instructor',
-        description: 'Instructor Role',
-        permissions: ['view'],
-        userCount: 10,
-      },
-    ],
-    resources: [{ key: 'library', label: 'Library', description: '' }],
-    canManageTeam: true,
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    // Mock route params
-    (useParams as jest.Mock).mockReturnValue({ username: 'testuser' });
-
-    const { useNavigate, useLocation } = jest.requireMock('react-router-dom');
-    useNavigate.mockReturnValue(mockNavigate);
-    useLocation.mockReturnValue({ pathname: '/authz/libraries/lib:123/testuser' });
-
-    // Mock library authz context
-    (useLibraryAuthZ as jest.Mock).mockReturnValue(defaultMockData);
-
-    // Mock library data
-    (useLibrary as jest.Mock).mockReturnValue({
-      data: {
-        title: 'Test Library',
-        org: 'Test Org',
-      },
-    });
-
-    // Mock team members
-    (useTeamMembers as jest.Mock).mockReturnValue({
-      data: {
-        results: [
-          {
-            username: 'testuser',
-            email: 'testuser@example.com',
-            roles: ['admin', 'instructor'],
-          },
-        ],
-      },
-      isLoading: false,
-      isFetching: false,
-    });
-
-    // Mock revoke user roles
-    (useRevokeUserRoles as jest.Mock).mockReturnValue({
-      mutate: mockMutate,
-      isPending: false,
-    });
-  });
-
-  const renderComponent = () => {
-    renderWrapper(
-      <ToastManagerProvider>
-        <LibrariesUserManager />
-      </ToastManagerProvider>,
-    );
-  };
-
-  it('renders the user roles correctly', () => {
-    renderComponent();
-
-    // Breadcrumb check
-    expect(screen.getByText('Manage Access')).toBeInTheDocument();
-    expect(screen.getByText('Library Team Management')).toBeInTheDocument();
-    expect(screen.getByRole('listitem', { current: 'page' })).toHaveTextContent('testuser');
-    // Page title and subtitle
-    expect(screen.getByRole('heading', { level: 2 })).toHaveTextContent('testuser');
-    expect(screen.getByRole('heading', { level: 3 })).toHaveTextContent('testuser@example.com');
-
-    expect(screen.getByText('Admin')).toBeInTheDocument();
-    expect(screen.getByText('Instructor')).toBeInTheDocument();
-
-    defaultMockData.roles.forEach((role) => {
-      expect(screen.getByText(role.name)).toBeInTheDocument();
-      expect(screen.getByText(role.description)).toBeInTheDocument();
-    });
-  });
-
-  it('renders assign role trigger when user has canManageTeam permission', () => {
-    renderComponent();
-
-    expect(screen.getByText('Assign Role')).toBeInTheDocument();
-  });
-
-  it('navigates to the wizard with the current user and return path when Assign Role is clicked', async () => {
-    const user = userEvent.setup();
-    renderComponent();
-
-    await user.click(screen.getByRole('button', { name: /Assign Role/i }));
-
-    expect(mockNavigate).toHaveBeenCalledWith(
-      buildWizardPath({ users: 'testuser', from: '/authz/libraries/lib:123/testuser' }),
-    );
-  });
-
-  it('renders correct navigation link label and URL on breadcrumb', () => {
-    renderComponent();
-    const navLinkManageAccess = screen.getByRole('link', { name: 'Manage Access' });
-    expect(navLinkManageAccess).toBeInTheDocument();
-    // TODO: Update expected URL when dedicated Manage Access page is created
-    expect(navLinkManageAccess).toHaveAttribute('href', '/authz/libraries/lib:123');
-    const navLinkLibraryTeamManagement = screen.getByRole('link', { name: 'Library Team Management' });
-    expect(navLinkLibraryTeamManagement).toBeInTheDocument();
-    expect(navLinkLibraryTeamManagement).toHaveAttribute('href', '/authz/libraries/lib:123');
-  });
-
-  describe('Navigation guards', () => {
-    it('redirects to team path when canManageTeam is false', () => {
-      (useLibraryAuthZ as jest.Mock).mockReturnValue({
-        ...defaultMockData,
-        canManageTeam: false,
-      });
-
-      renderComponent();
-
-      expect(mockNavigate).toHaveBeenCalledWith('/authz/libraries/lib:123');
-    });
-
-    it('redirects to team path when user is not found after loading completes', async () => {
-      (useTeamMembers as jest.Mock).mockReturnValue({
-        data: { results: [] },
-        isLoading: false,
-        isFetching: false,
-      });
-
-      renderComponent();
-
-      await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith('/authz/libraries/lib:123');
-      });
-    });
-
-    it('does not redirect while member data is still fetching', () => {
-      (useTeamMembers as jest.Mock).mockReturnValue({
-        data: undefined,
-        isLoading: true,
-        isFetching: true,
-      });
-
-      renderComponent();
-
-      // navigate should only be called for canManageTeam=true case (not at all here)
-      expect(mockNavigate).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('Loading state', () => {
-    it('renders skeleton while loading team member data', () => {
-      (useTeamMembers as jest.Mock).mockReturnValue({
-        data: undefined,
-        isLoading: true,
-        isFetching: true,
-      });
-
-      renderComponent();
-
-      // Just verify the component renders without crashing in loading state
-      expect(screen.queryByText('Admin')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Assign role button', () => {
-    it('navigates to assign-role wizard when Assign Role button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      // There are two "Assign Role" elements: the mocked AssignNewRoleTrigger and the real Button
-      // The real Button navigates; use getAllByText and click the one that is a <button>
-      const assignRoleButtons = screen.getAllByText('Assign Role');
-      const realButton = assignRoleButtons.find(
-        (el) => el.tagName === 'BUTTON' || el.closest('button[class*="btn-primary"]') !== null,
-      );
-      await user.click(realButton || assignRoleButtons[0]);
-
-      expect(mockNavigate).toHaveBeenCalledWith(
-        '/authz/assign-role?users=testuser&from=%2Fauthz%2Flibraries%2Flib%3A123%2Ftestuser',
-      );
-    });
-  });
-
-  describe('Revoking User Role Flow', () => {
-    it('opens confirmation modal when delete role button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-    });
-
-    it('displays correct confirmation modal content', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-        expect(screen.getByText(/Are you sure you want to remove the Admin role from/)).toBeInTheDocument();
-        expect(screen.getByText(/Test Library/)).toBeInTheDocument();
-      });
-    });
-
-    it('closes confirmation modal when cancel button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const cancelButton = screen.getByText('Cancel');
-      await user.click(cancelButton);
-
-      await waitFor(() => {
-        expect(screen.queryByText('Remove role?')).not.toBeInTheDocument();
-      });
-    });
-
-    it('calls revokeUserRoles mutation when Remove button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const removeButton = screen.getByText('Remove');
-      await user.click(removeButton);
-
-      expect(mockMutate).toHaveBeenCalledWith(
-        {
-          data: {
-            users: 'testuser',
-            role: 'admin',
-            scope: 'lib:123',
-          },
-        },
-        expect.objectContaining({
-          onSuccess: expect.any(Function),
-          onError: expect.any(Function),
-        }),
-      );
-    });
-
-    it('shows success toast when role is revoked successfully with multiple roles remaining', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const removeButton = screen.getByText('Remove');
-      await user.click(removeButton);
-
-      const onSuccessCallback = mockMutate.mock.calls[0][1].onSuccess;
-      onSuccessCallback({ errors: [] });
-
-      await waitFor(() => {
-        expect(screen.getByText(/The Admin role has been successfully removed/)).toBeInTheDocument();
-      });
-    });
-
-    it('shows success toast with user removal message when last role is revoked', async () => {
-      const user = userEvent.setup();
-
-      (useTeamMembers as jest.Mock).mockReturnValue({
-        data: {
-          results: [
-            {
-              username: 'testuser',
-              email: 'testuser@example.com',
-              roles: ['admin'],
-            },
-          ],
-        },
-        isLoading: false,
-        isFetching: false,
-      });
-
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const removeButton = screen.getByText('Remove');
-      await user.click(removeButton);
-
-      const onSuccessCallback = mockMutate.mock.calls[0][1].onSuccess;
-      onSuccessCallback({ errors: [] });
-
-      await waitFor(() => {
-        expect(screen.getByText(/The user no longer has access to this library/)).toBeInTheDocument();
-      });
-    });
-
-    it('shows error toast when role revocation fails with server error', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const removeButton = screen.getByText('Remove');
-      await user.click(removeButton);
-
-      const onErrorCallback = mockMutate.mock.calls[0][1].onError;
-      onErrorCallback(new Error('Network error'));
-
-      // Wait for the error toast to appear with a retry button
-      await waitFor(() => {
-        expect(screen.getByText(/Something went wrong/i)).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: /retry/i })).toBeInTheDocument();
-      });
-
-      // Second call to mutate also fails
-      mockMutate.mockImplementationOnce((_vars, { onError }) => {
-        onError(new Error('Network error'), _vars);
-      });
-
-      // Click retry button
-      const retryButton = screen.getByRole('button', { name: /retry/i });
-      await user.click(retryButton);
-
-      // The retry toast should appear again
-      await waitFor(() => {
-        expect(screen.getAllByText(/Something went wrong/i).length).toBeGreaterThanOrEqual(1);
-      });
-
-      // Ensure mutate was called twice (original + retry)
-      expect(mockMutate).toHaveBeenCalledTimes(2);
-    });
-
-    it('shows error toast when API fails to remove a role', async () => {
-      const user = userEvent.setup();
-
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const removeButton = screen.getByText('Remove');
-      await user.click(removeButton);
-
-      const { onSuccess } = mockMutate.mock.calls[0][1];
-      onSuccess({ errors: [{ error: 'role_removal_error' }] });
-
-      await waitFor(() => {
-        expect(screen.getByText(/Something went wrong/i)).toBeInTheDocument();
-      });
-    });
-
-    it('closes confirmation modal after successful role revocation', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const removeButton = screen.getByText('Remove');
-      await user.click(removeButton);
-
-      const onSuccessCallback = mockMutate.mock.calls[0][1].onSuccess;
-      onSuccessCallback({ errors: [] });
-
-      await waitFor(() => {
-        expect(screen.queryByText('Remove role?')).not.toBeInTheDocument();
-      });
-      expect(await screen.findByText(/role has been successfully removed/i)).toBeInTheDocument();
-    });
-
-    it('disables delete action when revocation is in progress', async () => {
-      const user = userEvent.setup();
-
-      (useRevokeUserRoles as jest.Mock).mockReturnValue({
-        mutate: mockMutate,
-        isPending: true,
-      });
-
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Admin');
-      await user.click(deleteButton);
-
-      expect(screen.queryByText('Remove role?')).not.toBeInTheDocument();
-      expect(mockMutate).not.toHaveBeenCalled();
-    });
-
-    it('passes correct context to confirmation modal', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const deleteButton = screen.getByText('delete-role-Instructor');
-      await user.click(deleteButton);
-
-      await waitFor(() => {
-        expect(screen.getByText('Remove role?')).toBeInTheDocument();
-      });
-
-      const modal = screen.getByRole('dialog');
-      expect(within(modal).getByText(/Instructor role/)).toBeInTheDocument();
-      expect(within(modal).getByText(/testuser/)).toBeInTheDocument();
-      expect(within(modal).getByText(/Test Library/)).toBeInTheDocument();
-    });
-  });
-});
diff --git a/src/authz-module/libraries-manager/LibrariesUserManager.tsx b/src/authz-module/libraries-manager/LibrariesUserManager.tsx
deleted file mode 100644
index f06981c6..00000000
--- a/src/authz-module/libraries-manager/LibrariesUserManager.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Container, Skeleton } from '@openedx/paragon';
-import { ROUTES } from '@src/authz-module/constants';
-import { Role } from 'types';
-import { useToastManager } from '@src/components/ToastManager/ToastManagerContext';
-import AddRoleButton from '@src/authz-module/components/AddRoleButton';
-import AuthZLayout from '../components/AuthZLayout';
-import { useLibraryAuthZ } from './context';
-import RoleCard from '../components/RoleCard';
-import ConfirmDeletionModal from './components/ConfirmDeletionModal';
-import { useLibrary, useRevokeUserRoles, useTeamMembers } from '../data/hooks';
-import { buildPermissionMatrixByRole } from './utils';
-
-import messages from './messages';
-
-const LibrariesUserManager = () => {
-  const intl = useIntl();
-  const navigate = useNavigate();
-  const { pathname } = useLocation();
-  const { username } = useParams();
-  const {
-    libraryId, permissions, roles, resources, canManageTeam,
-  } = useLibraryAuthZ();
-  const teamMembersPath = `/authz${ROUTES.LIBRARIES_TEAM_PATH.replace(':libraryId', libraryId)}`;
-
-  useEffect(() => {
-    if (!canManageTeam) {
-      navigate(teamMembersPath);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [canManageTeam]);
-
-  const { data: library } = useLibrary(libraryId);
-  const { mutate: revokeUserRoles, isPending: isRevokingUserRole } = useRevokeUserRoles();
-  const rootBreadcrumb = intl.formatMessage(messages['library.authz.breadcrumb.root']) || '';
-  const pageManageTitle = intl.formatMessage(messages['library.authz.manage.page.title']);
-  const querySettings = {
-    order: null,
-    pageIndex: 0,
-    pageSize: 1,
-    roles: null,
-    search: username || null,
-    sortBy: null,
-  };
-
-  const [roleToDelete, setRoleToDelete] = useState<Role | null>(null);
-  const [showConfirmDeletionModal, setShowConfirmDeletionModal] = useState(false);
-  const {
-    showToast, showErrorToast, Bold, Br,
-  } = useToastManager();
-
-  const {
-    data: teamMember, isLoading: isLoadingTeamMember, isFetching: isFetchingMember,
-  } = useTeamMembers(libraryId, querySettings);
-  const user = teamMember?.results?.find(member => member.username === username);
-
-  const userRoles = useMemo(() => {
-    const assignedRoles = roles.filter(role => user?.roles.includes(role.role));
-    return buildPermissionMatrixByRole({
-      roles: assignedRoles, permissions, resources, intl,
-    });
-  }, [roles, user?.roles, permissions, resources, intl]);
-
-  useEffect(() => {
-    if (!isFetchingMember) {
-      if (!isLoadingTeamMember && !user?.username) {
-        navigate(teamMembersPath);
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isFetchingMember, isLoadingTeamMember, user?.username]);
-
-  const handleCloseConfirmDeletionModal = () => {
-    setRoleToDelete(null);
-    setShowConfirmDeletionModal(false);
-  };
-
-  const handleShowConfirmDeletionModal = (role: Role) => {
-    if (isRevokingUserRole) { return; }
-
-    setRoleToDelete(role);
-    setShowConfirmDeletionModal(true);
-  };
-
-  const handleRevokeUserRole = () => {
-    if (!user || !roleToDelete) { return; }
-
-    const data = {
-      users: user.username,
-      role: roleToDelete.role,
-      scope: libraryId,
-    };
-
-    const runRevokeRole = (variables = { data }) => {
-      revokeUserRoles(variables, {
-        onSuccess: (response) => {
-          const { errors } = response;
-
-          if (errors.length) {
-            showToast({
-              type: 'error',
-              message: intl.formatMessage(
-                messages['library.authz.team.toast.default.error.message'],
-                { Bold, Br },
-              ),
-            });
-            return;
-          }
-
-          const remainingRolesCount = userRoles.length - 1;
-          showToast({
-            message: intl.formatMessage(
-              messages['library.authz.team.remove.user.toast.success.description'],
-              {
-                role: roleToDelete.name,
-                rolesCount: remainingRolesCount,
-              },
-            ),
-            type: 'success',
-          });
-        },
-        onError: (error, retryVariables) => {
-          showErrorToast(error, () => runRevokeRole(retryVariables));
-        },
-      });
-    };
-
-    handleCloseConfirmDeletionModal();
-    runRevokeRole();
-  };
-
-  return (
-    <div className="authz-module">
-      <ConfirmDeletionModal
-        isOpen={showConfirmDeletionModal}
-        close={handleCloseConfirmDeletionModal}
-        onSave={handleRevokeUserRole}
-        isDeleting={isRevokingUserRole}
-        context={{
-          userName: user?.username || '',
-          scope: library.title,
-          role: roleToDelete?.name || '',
-          rolesCount: userRoles.length,
-        }}
-      />
-
-      <AuthZLayout
-        context={{ id: libraryId, title: library.title, org: library.org }}
-        // Temporarily setting '/authz/libraries/:libraryId' as the URL for Manage Access breadcrumb for now as
-        // currently we do not have a dedicated page. TODO: Update when such page is created.
-        navLinks={[{ label: rootBreadcrumb, to: teamMembersPath }, { label: pageManageTitle, to: teamMembersPath }]}
-        activeLabel={user?.username || ''}
-        pageTitle={user?.username || ''}
-        pageSubtitle={user?.email || ''}
-        actions={(user && canManageTeam)
-          ? [<AddRoleButton from={pathname} presetUsername={user.username} />]
-          : []}
-      >
-        <Container className="bg-light-200 p-5">
-          {isLoadingTeamMember ? <Skeleton count={2} height={200} /> : null}
-          {userRoles && userRoles.map(role => (
-            <RoleCard
-              key={`${role.role}-${username}`}
-              title={role.name}
-              objectName={library.title}
-              description={role.description}
-              handleDelete={() => handleShowConfirmDeletionModal(role)}
-              permissionsByResource={role.resources as any[]}
-            />
-          ))}
-        </Container>
-      </AuthZLayout>
-    </div>
-  );
-};
-
-export default LibrariesUserManager;
diff --git a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberModal.test.tsx b/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberModal.test.tsx
deleted file mode 100644
index e4ad08a8..00000000
--- a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberModal.test.tsx
+++ /dev/null
@@ -1,244 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import AddNewTeamMemberModal from './AddNewTeamMemberModal';
-
-// Mock the context module
-jest.mock('@src/authz-module/libraries-manager/context', () => {
-  const actual = jest.requireActual('@src/authz-module/libraries-manager/context');
-  return {
-    ...actual,
-    useLibraryAuthZ: jest.fn(),
-  };
-});
-const mockedUseLibraryAuthZ = useLibraryAuthZ as jest.Mock;
-
-jest.mock('@src/authz-module/data/hooks', () => ({
-  useTeamRoles: jest.fn(),
-}));
-
-const defaultProps = {
-  isOpen: true,
-  isLoading: false,
-  isError: false,
-  formValues: {
-    users: '',
-    role: '',
-  },
-  close: jest.fn(),
-  onSave: jest.fn(),
-  handleChangeForm: jest.fn(),
-};
-
-const mockRoles = [
-  {
-    role: 'instructor',
-    name: 'instructor',
-    description: 'Can create and edit content',
-    userCount: 3,
-    objects: [
-      {
-        object: 'library',
-        description: 'Library permissions',
-        actions: ['view', 'edit', 'delete'],
-      },
-    ],
-  },
-  {
-    role: 'admin',
-    name: 'admin',
-    description: 'Full access to the library',
-    userCount: 1,
-    objects: [
-      {
-        object: 'library',
-        description: 'Library permissions',
-        actions: ['view', 'edit', 'delete', 'manage'],
-      },
-    ],
-  },
-];
-
-describe('AddNewTeamMemberModal', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockedUseLibraryAuthZ.mockReturnValue({
-      username: 'testuser',
-      libraryId: 'lib123',
-      roles: mockRoles,
-      canManageTeam: true,
-    });
-  });
-
-  const renderModal = (props = {}) => {
-    const finalProps = { ...defaultProps, ...props };
-    return renderWrapper(
-      <AddNewTeamMemberModal {...finalProps} />,
-    );
-  };
-
-  describe('Modal Rendering', () => {
-    it('renders the modal when isOpen is true', () => {
-      renderModal();
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument();
-      expect(screen.getByText('Add New Team Member')).toBeInTheDocument();
-    });
-
-    it('does not render the modal when isOpen is false', () => {
-      renderModal({ isOpen: false });
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Form Elements', () => {
-    it('renders the users textarea with correct label', () => {
-      renderModal();
-
-      expect(screen.getByLabelText('Add users by username or email')).toBeInTheDocument();
-      expect(screen.getByRole('textbox', { name: /add users by username or email/i })).toBeInTheDocument();
-    });
-
-    it('renders the role select dropdown with correct label', () => {
-      renderModal();
-
-      expect(screen.getAllByLabelText('Roles')[0]).toBeInTheDocument();
-      expect(screen.getByRole('combobox', { name: /roles/i })).toBeInTheDocument();
-    });
-
-    it('renders role options correctly', () => {
-      renderModal();
-
-      expect(screen.getByText('Select a role')).toBeInTheDocument();
-      mockRoles.forEach((role) => {
-        expect(screen.getByText(role.role)).toBeInTheDocument();
-      });
-    });
-
-    it('displays form values correctly', () => {
-      renderModal({
-        formValues: {
-          users: 'user1@example.com, user2@example.com',
-          role: 'instructor',
-        },
-      });
-
-      expect(screen.getByDisplayValue('user1@example.com, user2@example.com')).toBeInTheDocument();
-      expect(screen.getByDisplayValue('instructor')).toBeInTheDocument();
-    });
-  });
-
-  describe('Form Interactions', () => {
-    it('calls handleChangeForm when users textarea changes', async () => {
-      const user = userEvent.setup();
-      const handleChangeForm = jest.fn();
-      renderModal({ handleChangeForm });
-
-      const usersTextarea = screen.getByRole('textbox', { name: /add users by username or email/i });
-      await user.type(usersTextarea, 'test@example.com');
-
-      expect(handleChangeForm).toHaveBeenCalled();
-    });
-
-    it('calls handleChangeForm when role select changes', async () => {
-      const user = userEvent.setup();
-      const handleChangeForm = jest.fn();
-      renderModal({ handleChangeForm });
-
-      const roleSelect = screen.getByRole('combobox', { name: /roles/i });
-      await user.selectOptions(roleSelect, 'instructor');
-
-      expect(handleChangeForm).toHaveBeenCalled();
-    });
-  });
-
-  describe('Modal Actions', () => {
-    it('renders Cancel and Save buttons', () => {
-      renderModal();
-
-      expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: /save/i })).toBeInTheDocument();
-    });
-
-    it('calls close function when Cancel button is clicked', async () => {
-      const user = userEvent.setup();
-      const close = jest.fn();
-      renderModal({ close });
-
-      await user.click(screen.getByRole('button', { name: /cancel/i }));
-
-      expect(close).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls onSave function when Save button is clicked', async () => {
-      const user = userEvent.setup();
-      const onSave = jest.fn();
-      renderModal({
-        onSave,
-        formValues: {
-          users: 'test@example.com',
-          role: 'instructor',
-        },
-      });
-
-      await user.click(screen.getByRole('button', { name: /save/i }));
-
-      expect(onSave).toHaveBeenCalledTimes(1);
-    });
-
-    it('disables Save button when users field is empty', () => {
-      renderModal({
-        formValues: {
-          users: '',
-          role: 'instructor',
-        },
-      });
-
-      expect(screen.getByRole('button', { name: /save/i })).toBeDisabled();
-    });
-
-    it('disables Save button when role field is empty', () => {
-      renderModal({
-        formValues: {
-          users: 'test@example.com',
-          role: '',
-        },
-      });
-
-      expect(screen.getByRole('button', { name: /save/i })).toBeDisabled();
-    });
-
-    it('enables Save button when both fields are filled', () => {
-      renderModal({
-        formValues: {
-          users: 'test@example.com',
-          role: 'instructor',
-        },
-      });
-
-      expect(screen.getByRole('button', { name: /save/i })).not.toBeDisabled();
-    });
-  });
-
-  describe('Loading State', () => {
-    it('disables Cancel button when loading', () => {
-      renderModal({ isLoading: true });
-
-      expect(screen.getByRole('button', { name: /cancel/i })).toBeDisabled();
-    });
-
-    it('disables Save button when loading', () => {
-      renderModal({
-        isLoading: true,
-        formValues: {
-          users: 'test@example.com',
-          role: 'instructor',
-        },
-      });
-
-      expect(screen.getByRole('button', { name: /saving/i })).toBeDisabled();
-    });
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberModal.tsx b/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberModal.tsx
deleted file mode 100644
index 67a85fd7..00000000
--- a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberModal.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { useRef } from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  ActionRow, Form, Hyperlink, Icon, IconButton, ModalDialog,
-  ModalPopup,
-  Stack,
-  StatefulButton,
-  useToggle,
-} from '@openedx/paragon';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { Info, SpinnerSimple } from '@openedx/paragon/icons';
-import messages from './messages';
-
-interface AddNewTeamMemberModalProps {
-  isOpen: boolean;
-  isError: boolean;
-  isLoading: boolean;
-  formValues: {
-    users: string;
-    role: string;
-  };
-  close: () => void;
-  onSave: () => void;
-  handleChangeForm: (e: React.ChangeEvent<HTMLTextAreaElement | HTMLSelectElement>) => void;
-}
-
-const AddNewTeamMemberModal = ({
-  isOpen, isError, isLoading, formValues, close, onSave, handleChangeForm,
-}: AddNewTeamMemberModalProps) => {
-  const intl = useIntl();
-  const { roles } = useLibraryAuthZ();
-  const [isOpenRolesPopUp, openRolesPopUp, closeRolesPopUp] = useToggle(false);
-  const targetRolesPopUpRef = useRef<HTMLButtonElement | null>(null);
-  return (
-    <>
-      <ModalPopup
-        hasArrow
-        placement="auto"
-        positionRef={targetRolesPopUpRef.current}
-        isOpen={isOpenRolesPopUp}
-        onClose={closeRolesPopUp}
-      >
-        <div className="bg-white p-3 rounded shadow border x-small">
-          <ul>
-            {roles.map((role) => <li key={`role-tooltip-${role.role}`}><b>{role.name}: </b>{role.description}</li>)}
-          </ul>
-          <Hyperlink destination="#libraries-permissions-tab" target="_blank">{intl.formatMessage(messages['libraries.authz.manage.tooltip.roles.extra.info'])}</Hyperlink>
-        </div>
-      </ModalPopup>
-      <ModalDialog
-        title={intl.formatMessage(messages['libraries.authz.manage.add.member.title'])}
-        isOpen={isOpen}
-        onClose={isLoading ? () => { } : close}
-        size="lg"
-        variant="dark"
-        hasCloseButton
-        isBlocking
-        isOverflowVisible={false}
-        zIndex={5}
-      >
-        <ModalDialog.Header className="bg-primary-500 text-light-100">
-          <ModalDialog.Title>
-            {intl.formatMessage(messages['libraries.authz.manage.add.member.title'])}
-          </ModalDialog.Title>
-        </ModalDialog.Header>
-
-        <ModalDialog.Body className="my-4">
-          <Stack gap={3}>
-            <p>
-              {intl.formatMessage(messages['libraries.authz.manage.add.member.description'])}
-            </p>
-
-            <Form.Group controlId="users_list">
-              <Form.Label>{intl.formatMessage(messages['libraries.authz.manage.add.member.users.label'])}</Form.Label>
-              <Form.Control
-                isInvalid={isError}
-                as="textarea"
-                name="users"
-                rows="3"
-                value={formValues.users}
-                onChange={(e) => handleChangeForm(e)}
-                placeholder={intl.formatMessage(messages['libraries.authz.manage.add.member.users.placeholder'])}
-                style={{ color: isError && 'var(--pgn-color-form-feedback-invalid)' }}
-              />
-            </Form.Group>
-
-            <Form.Group controlId="role_options">
-              <Form.Label>
-                {intl.formatMessage(messages['libraries.authz.manage.add.member.roles.label'])}
-                <IconButton alt="tooptip-extra-info" size="inline" src={Info} onClick={openRolesPopUp} ref={targetRolesPopUpRef} />
-              </Form.Label>
-              <Form.Control as="select" name="role" value={formValues.role} onChange={(e) => handleChangeForm(e)}>
-                <option value="" disabled>
-                  {intl.formatMessage(messages['libraries.authz.manage.add.member.select.default'])}
-                </option>
-                {roles.map((role) => <option key={role.role} value={role.role}>{role.name}</option>)}
-              </Form.Control>
-            </Form.Group>
-          </Stack>
-        </ModalDialog.Body>
-
-        <ModalDialog.Footer>
-          <ActionRow>
-            <ModalDialog.CloseButton variant="tertiary" disabled={isLoading}>
-              {intl.formatMessage(messages['libraries.authz.manage.cancel.button'])}
-            </ModalDialog.CloseButton>
-            <StatefulButton
-              className="px-4"
-              labels={{
-                default: intl.formatMessage(messages['libraries.authz.manage.save.button']),
-                pending: intl.formatMessage(messages['libraries.authz.manage.saving.button']),
-              }}
-              icons={{
-                pending: <Icon src={SpinnerSimple} />,
-              }}
-              state={isLoading ? 'pending' : 'default'}
-              onClick={() => onSave()}
-              disabledStates={['pending']}
-              disabled={isLoading || !formValues.users || !formValues.role}
-            />
-          </ActionRow>
-        </ModalDialog.Footer>
-      </ModalDialog>
-    </>
-  );
-};
-
-export default AddNewTeamMemberModal;
diff --git a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.test.tsx b/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.test.tsx
deleted file mode 100644
index c7bd1cee..00000000
--- a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.test.tsx
+++ /dev/null
@@ -1,452 +0,0 @@
-import React, { act } from 'react';
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { useAssignTeamMembersRole } from '@src/authz-module/data/hooks';
-import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
-import AddNewTeamMemberTrigger from './AddNewTeamMemberTrigger';
-
-jest.mock('@edx/frontend-platform/logging');
-
-const mockMutate = jest.fn();
-
-// Mock the hooks module
-jest.mock('@src/authz-module/data/hooks', () => ({
-  useAssignTeamMembersRole: jest.fn(),
-}));
-
-jest.mock('./AddNewTeamMemberModal', () => {
-  /* eslint-disable react/prop-types */
-  const MockModal = ({
-    isOpen, close, onSave, isLoading, formValues, handleChangeForm,
-  }) => (
-    isOpen ? (
-      <div role="dialog" aria-label="assign role">
-        <button type="button" onClick={close} aria-label="Close modal">Close</button>
-        <button type="button" onClick={onSave} aria-label="Save team member">Save</button>
-        <textarea
-          name="users"
-          value={formValues?.users || ''}
-          onChange={handleChangeForm}
-          aria-label="Enter user emails or usernames"
-          placeholder="Enter emails or usernames"
-        />
-        <select
-          name="role"
-          value={formValues?.role || ''}
-          onChange={handleChangeForm}
-          aria-label="Select role"
-        >
-          <option value="">Select role</option>
-          <option value="admin">Admin</option>
-          <option value="editor">Editor</option>
-        </select>
-        {isLoading && <div role="status" aria-label="Adding team member loader">Loading...</div>}
-      </div>
-    ) : null
-  );
-  /* eslint-enable react/prop-types */
-  return MockModal;
-});
-
-describe('AddNewTeamMemberTrigger', () => {
-  const mockLibraryId = 'lib:123';
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    (useAssignTeamMembersRole as jest.Mock).mockReturnValue({
-      mutate: mockMutate,
-      isPending: false,
-      isError: false,
-      isSuccess: false,
-    } as any);
-  });
-
-  it('renders the trigger button', () => {
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const button = screen.getByRole('button', { name: /assign role/i });
-    expect(button).toBeInTheDocument();
-  });
-
-  it('opens modal when trigger button is clicked', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    expect(screen.getByRole('dialog', { name: 'assign role' })).toBeInTheDocument();
-  });
-
-  it('closes modal when close button is clicked', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    expect(screen.getByRole('dialog', { name: 'assign role' })).toBeInTheDocument();
-
-    const closeButton = screen.getByRole('button', { name: 'Close modal' });
-    await user.click(closeButton);
-
-    expect(screen.queryByRole('dialog', { name: 'assign role' })).not.toBeInTheDocument();
-  });
-
-  it('calls addTeamMember with correct data when save is clicked', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const usersInput = screen.getByRole('textbox', { name: 'Enter user emails or usernames' });
-    const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-
-    await user.type(usersInput, 'alice@example.com, bob@example.com');
-    await user.selectOptions(roleSelect, 'editor');
-    await user.click(saveButton);
-
-    expect(mockMutate).toHaveBeenCalledWith(
-      {
-        data: {
-          users: ['alice@example.com', 'bob@example.com'],
-          role: 'editor',
-          scope: mockLibraryId,
-        },
-      },
-      expect.objectContaining({
-        onSuccess: expect.any(Function),
-      }),
-    );
-  });
-
-  it('displays success toast and closes modal on successful addition with no errors', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    // Simulate successful response with no errors
-    const [, { onSuccess }] = mockMutate.mock.calls[0];
-    onSuccess({
-      completed: [
-        { userIdentifier: 'alice@example.com', status: 'role_added' },
-        { userIdentifier: 'bob@example.com', status: 'added_to_team' },
-      ],
-      errors: [],
-    });
-
-    await waitFor(() => {
-      expect(screen.queryByRole('dialog', { name: 'assign role' })).not.toBeInTheDocument();
-    });
-
-    expect(screen.getByText(/2 team members added successfully/)).toBeInTheDocument();
-  });
-
-  it('displays mixed success and error toast on partial success', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    // Simulate partial success response
-    const [, { onSuccess }] = mockMutate.mock.calls[0];
-    onSuccess({
-      completed: [
-        { userIdentifier: 'alice@example.com', status: 'role_added' },
-      ],
-      errors: [
-        { userIdentifier: 'unknown@example.com', error: 'user_not_found' },
-      ],
-    });
-
-    await waitFor(() => {
-      expect(screen.getByText(/1 team member added successfully/)).toBeInTheDocument();
-      expect(screen.getByText(/We couldn't find a user for 1 email address or username/)).toBeInTheDocument();
-    });
-
-    // Modal should remain open when there are errors
-    expect(screen.getByRole('dialog', { name: 'assign role' })).toBeInTheDocument();
-  });
-
-  it('filters out successfully added users from error users list', async () => {
-    const user = userEvent.setup();
-
-    const mockPartialResponse = {
-      completed: [
-        { userIdentifier: 'alice@example.com' },
-      ],
-      errors: [
-        { userIdentifier: 'bob@example.com', error: 'USER_NOT_FOUND' },
-        { userIdentifier: 'charlie@example.com', error: 'USER_NOT_FOUND' },
-      ],
-    };
-
-    (useAssignTeamMembersRole as jest.Mock).mockReturnValue({
-      mutate: jest.fn((_variables, { onSuccess }) => {
-        onSuccess(mockPartialResponse);
-      }),
-      isPending: false,
-    });
-
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const usersInput = screen.getByRole('textbox', { name: /Enter user emails or usernames/i });
-    const roleSelect = screen.getByRole('combobox', { name: /Select role/i });
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-
-    await user.type(usersInput, 'alice@example.com, bob@example.com, charlie@example.com');
-    await user.selectOptions(roleSelect, 'editor');
-    await user.click(saveButton);
-
-    await waitFor(() => {
-      expect(usersInput).toHaveValue('bob@example.com, charlie@example.com');
-    });
-
-    await user.type(usersInput, ', new@example.com');
-
-    await waitFor(() => {
-      expect(usersInput).toHaveValue('bob@example.com, charlie@example.com, new@example.com');
-    });
-  });
-
-  it('displays only error toast when all additions fail', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    // Simulate all failed response
-    const [, { onSuccess }] = mockMutate.mock.calls[0];
-    onSuccess({
-      completed: [],
-      errors: [
-        { userIdentifier: 'unknown1@example.com', error: 'user_not_found' },
-        { userIdentifier: 'unknown2@example.com', error: 'user_not_found' },
-      ],
-    });
-
-    await waitFor(() => {
-      expect(screen.getByText(/We couldn't find a user for 2 email addresses or usernames/)).toBeInTheDocument();
-    });
-
-    // Modal should remain open when there are errors
-    expect(screen.getByRole('dialog', { name: 'assign role' })).toBeInTheDocument();
-  });
-
-  it('displays different error toast when different errors happen', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    const [, { onSuccess }] = mockMutate.mock.calls[0];
-    onSuccess({
-      completed: [],
-      errors: [
-        { userIdentifier: 'unknown@example.com', error: 'user_not_found' },
-        { userIdentifier: 'already@example.com', error: 'user_already_has_role' },
-      ],
-    });
-
-    await waitFor(() => {
-      expect(screen.getByText(/We couldn't find a user for 1 email address or username/)).toBeInTheDocument();
-      expect(screen.getByText(/The user already has the role/)).toBeInTheDocument();
-    });
-
-    expect(screen.getByRole('dialog', { name: 'assign role' })).toBeInTheDocument();
-  });
-
-  it('resets form values after successful addition with no errors', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const usersInput = screen.getByRole('textbox', { name: 'Enter user emails or usernames' });
-    const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-
-    await user.type(usersInput, 'alice@example.com');
-    await user.selectOptions(roleSelect, 'editor');
-    await user.click(saveButton);
-
-    // Simulate successful response with no errors
-    const [, { onSuccess }] = mockMutate.mock.calls[0];
-    onSuccess({
-      completed: [{ userIdentifier: 'alice@example.com', status: 'role_added' }],
-      errors: [],
-    });
-
-    // Open modal again to check if form is reset
-    await user.click(triggerButton);
-
-    const newUsersInput = screen.getByRole('textbox', { name: 'Enter user emails or usernames' });
-    const newRoleSelect = screen.getByRole('combobox', { name: 'Select role' });
-
-    expect(newUsersInput).toHaveValue('');
-    expect(newRoleSelect).toHaveValue('');
-  });
-
-  it('allows closing the success/error toast message', async () => {
-    const user = userEvent.setup();
-    renderWrapper(<ToastManagerProvider><AddNewTeamMemberTrigger libraryId={mockLibraryId} /></ToastManagerProvider>);
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    // Simulate successful response
-    const [, { onSuccess }] = mockMutate.mock.calls[0];
-    onSuccess({
-      completed: [{ userIdentifier: 'alice@example.com', status: 'role_added' }],
-      errors: [],
-    });
-
-    // Toast should be visible
-    await waitFor(() => {
-      expect(screen.getByText(/1 team member added successfully/)).toBeInTheDocument();
-    });
-
-    // Find and close the toast
-    const toastCloseButton = screen.getByLabelText(/close/i);
-    await user.click(toastCloseButton);
-
-    // Toast should be removed
-    await waitFor(() => {
-      expect(screen.queryByText('1 team member added successfully.')).not.toBeInTheDocument();
-    });
-  });
-
-  it('shows retry toast on API failure and displays another toast when retry fails again', async () => {
-    const user = userEvent.setup();
-
-    const mockError = new Error('Network error');
-
-    mockMutate.mockImplementationOnce((_vars, { onError }) => {
-      onError(mockError, _vars);
-    });
-
-    renderWrapper(
-      <ToastManagerProvider>
-        <AddNewTeamMemberTrigger libraryId={mockLibraryId} />
-      </ToastManagerProvider>,
-    );
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    await waitFor(() => {
-      expect(screen.getByText(/Something went wrong/i)).toBeInTheDocument();
-      expect(screen.getByRole('button', { name: /retry/i })).toBeInTheDocument();
-    });
-
-    mockMutate.mockImplementationOnce((_vars, { onError }) => {
-      onError(new Error('Network error'), _vars);
-    });
-
-    const retryButton = screen.getByRole('button', { name: /retry/i });
-    await user.click(retryButton);
-
-    await waitFor(() => {
-      expect(screen.getByText(/Something went wrong/)).toBeInTheDocument();
-    });
-
-    // Ensure mutate was called twice (original + retry)
-    expect(mockMutate).toHaveBeenCalledTimes(2);
-  });
-
-  it('displays loading state when adding team member', async () => {
-    const user = userEvent.setup();
-
-    const { rerender } = renderWrapper(
-      <ToastManagerProvider>
-        <AddNewTeamMemberTrigger libraryId="lib:123" />
-      </ToastManagerProvider>,
-    );
-
-    const rerenderHook = () => rerender(
-      <ToastManagerProvider>
-        <AddNewTeamMemberTrigger libraryId="lib:123" />
-      </ToastManagerProvider>,
-    );
-
-    let isPending = false;
-    const mutateMock = jest.fn((_args, { onSuccess }) => {
-      isPending = true;
-      rerenderHook();
-      setTimeout(() => {
-        isPending = false;
-        rerenderHook();
-        onSuccess?.({
-          completed: [{ userIdentifier: _args.data.users[0], status: 'role_added' }],
-          errors: [],
-        });
-      }, 10);
-    });
-
-    (useAssignTeamMembersRole as jest.Mock).mockImplementation(() => ({
-      mutate: mutateMock,
-      isPending,
-      isError: false,
-      isSuccess: false,
-    }));
-
-    const triggerButton = screen.getByRole('button', { name: /assign role/i });
-    await user.click(triggerButton);
-
-    const userInput = screen.getByRole('textbox', { name: 'Enter user emails or usernames' });
-    const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-    await user.type(userInput, 'alice@example.com');
-    await user.selectOptions(roleSelect, 'editor');
-
-    const saveButton = screen.getByRole('button', { name: 'Save team member' });
-    await user.click(saveButton);
-
-    // should now reflect isPending = true
-    act(async () => {
-      const loadingIndicator = await screen.findByRole('status', { name: 'Adding team member loader' });
-      expect(loadingIndicator).toBeInTheDocument();
-      expect(loadingIndicator).toHaveTextContent('Loading...');
-    });
-
-    expect(mutateMock).toHaveBeenCalledWith(
-      {
-        data: {
-          users: ['alice@example.com'],
-          role: 'editor',
-          scope: 'lib:123',
-        },
-      },
-      expect.any(Object),
-    );
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.tsx b/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.tsx
deleted file mode 100644
index 66c5c408..00000000
--- a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/AddNewTeamMemberTrigger.tsx
+++ /dev/null
@@ -1,222 +0,0 @@
-import React, { useState } from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Button, useToggle } from '@openedx/paragon';
-import { Plus } from '@openedx/paragon/icons';
-
-import { PutAssignTeamMembersRoleResponse } from '@src/authz-module/data/api';
-import { useAssignTeamMembersRole } from '@src/authz-module/data/hooks';
-import { RoleOperationErrorStatus, DEFAULT_TOAST_DELAY } from '@src/authz-module/constants';
-import { AppToast, useToastManager } from '@src/components/ToastManager/ToastManagerContext';
-import baseMessages from '@src/authz-module/messages';
-import AddNewTeamMemberModal from './AddNewTeamMemberModal';
-import messages from './messages';
-
-type AppToastOmitIdType = Omit<AppToast, 'id'>;
-interface AddNewTeamMemberTriggerProps {
-  libraryId: string;
-}
-
-const DEFAULT_FORM_VALUES = {
-  users: '',
-  role: '',
-};
-
-const AddNewTeamMemberTrigger = ({ libraryId }: AddNewTeamMemberTriggerProps) => {
-  const intl = useIntl();
-  const [isOpen, open, close] = useToggle(false);
-  const [formValues, setFormValues] = useState(DEFAULT_FORM_VALUES);
-  const [isError, setIsError] = useState(false);
-  const [errorUsers, setErrorUsers] = useState<string[]>([]);
-
-  const { mutate: assignTeamMembersRole, isPending } = useAssignTeamMembersRole();
-  const {
-    showToast, showErrorToast, Bold, Br,
-  } = useToastManager();
-
-  const resetForm = () => {
-    setFormValues(DEFAULT_FORM_VALUES);
-    setErrorUsers([]);
-    setIsError(false);
-  };
-
-  const handleClose = () => {
-    resetForm();
-    close();
-  };
-
-  const handleChangeForm = (
-    e: React.ChangeEvent<HTMLTextAreaElement | HTMLSelectElement>,
-  ) => {
-    const { name, value } = e.target;
-    const userIds = value
-      .split(',')
-      .map((id) => id.trim())
-      .filter(Boolean);
-
-    // Flag error if current value still includes invalid users
-    const hasInvalidUser = errorUsers.some((u) => userIds.includes(u));
-    setIsError(hasInvalidUser);
-
-    setFormValues((prev) => ({ ...prev, [name]: value }));
-  };
-
-  const buildErrorMessages = (
-    errors: PutAssignTeamMembersRoleResponse['errors'],
-  ): Array<AppToastOmitIdType> => {
-    const notFoundUsers = errors
-      .filter((err) => err.error === RoleOperationErrorStatus.USER_NOT_FOUND)
-      .map((err) => err.userIdentifier.trim());
-
-    const otherErrors = errors.filter(
-      (err) => err.error !== RoleOperationErrorStatus.USER_NOT_FOUND
-       && err.error !== RoleOperationErrorStatus.USER_ALREADY_HAS_ROLE,
-    );
-
-    const result: Array<AppToastOmitIdType> = [];
-
-    const errorTypes = [
-      {
-        errorMessageId: 'libraries.authz.manage.add.member.failure.not.found',
-        users: notFoundUsers,
-      },
-      {
-        errorMessageId: 'libraries.authz.manage.add.member.failure.generic',
-        users: otherErrors,
-      },
-    ];
-
-    errorTypes.forEach(({ errorMessageId, users }) => {
-      if (users.length === 0) { return; }
-      const errorMessage = intl.formatMessage(messages[errorMessageId], {
-        count: users.length,
-        userIds: users.join(', '),
-        Bold,
-        Br,
-      });
-      result.push({ message: errorMessage, type: 'error' });
-    });
-
-    return result;
-  };
-
-  const buildSuccessMessage = (completed: PutAssignTeamMembersRoleResponse['completed']): AppToastOmitIdType => {
-    const userIds = completed.map((user) => user.userIdentifier).join(', ');
-    const successMessage = intl.formatMessage(messages['libraries.authz.manage.add.member.success'], {
-      count: completed.length,
-      userIds,
-    });
-
-    return {
-      message: successMessage,
-      type: 'success',
-    };
-  };
-
-  const buildRoleAlreadyAssignedMessage = (
-    roleAlreadyAsignedUsers: PutAssignTeamMembersRoleResponse['errors'],
-  ): AppToastOmitIdType => {
-    const roleAlreadyAssignedUserIds = roleAlreadyAsignedUsers.map((err) => err.userIdentifier.trim());
-    const roleAlreadyAssignedMessage = intl.formatMessage(messages['libraries.authz.manage.assign.role.existing'], {
-      count: roleAlreadyAssignedUserIds.length,
-      userIds: roleAlreadyAssignedUserIds.join(', '),
-      Bold,
-      Br,
-    });
-    return {
-      message: roleAlreadyAssignedMessage,
-      type: 'success',
-    };
-  };
-
-  const handleAddTeamMember = () => {
-    const normalizedUsers = [...new Set(
-      formValues.users
-        .split(',')
-        .map((u) => u.trim())
-        .filter(Boolean),
-    )];
-
-    const payload = {
-      users: normalizedUsers,
-      role: formValues.role,
-      scope: libraryId,
-    };
-
-    const runAssignMembers = (variables = { data: payload }) => {
-      assignTeamMembersRole(variables, {
-        onSuccess: (response) => {
-          const { completed, errors } = response;
-          const feedbackMessages: Array<AppToastOmitIdType> = [];
-          const { USER_ALREADY_HAS_ROLE } = RoleOperationErrorStatus;
-          // Users who already have the role assigned are not considered errors
-          const roleAlreadyAssignedUsers = errors.filter((error) => error.error === USER_ALREADY_HAS_ROLE);
-          const cleanErrors = errors.filter((error) => error.error !== USER_ALREADY_HAS_ROLE);
-
-          if (completed.length) {
-            feedbackMessages.push(buildSuccessMessage(completed));
-          }
-          if (roleAlreadyAssignedUsers.length) {
-            feedbackMessages.push(buildRoleAlreadyAssignedMessage(roleAlreadyAssignedUsers));
-          }
-          if (cleanErrors.length) {
-            const errorMessages = buildErrorMessages(cleanErrors);
-            feedbackMessages.push(...errorMessages);
-
-            const successUserIds = [
-              ...completed.map(c => c.userIdentifier),
-              ...roleAlreadyAssignedUsers.map(r => r.userIdentifier),
-            ];
-
-            const errorUserIds = normalizedUsers.filter((user) => !successUserIds.includes(user));
-            setErrorUsers(errorUserIds);
-            setIsError(true);
-            setFormValues((prev) => ({
-              ...prev,
-              users: errorUserIds.join(', '),
-            }));
-          }
-
-          // Calculate delay based on the number of feedback messages, 5 seconds per message
-          const delay = DEFAULT_TOAST_DELAY * feedbackMessages.length;
-          feedbackMessages.forEach(({ message, type }) => {
-            showToast({ message, type, delay });
-          });
-
-          if (!cleanErrors.length) {
-            handleClose();
-          }
-        },
-        onError: (error, retryVariables) => {
-          showErrorToast(error, () => runAssignMembers(retryVariables));
-        },
-      });
-    };
-    runAssignMembers();
-  };
-
-  return (
-    <>
-      <Button
-        iconBefore={Plus}
-        onClick={open}
-        disabled={isPending}
-      >
-        {intl.formatMessage(baseMessages['authz.management.assign.role.title'])}
-      </Button>
-
-      {isOpen && (
-        <AddNewTeamMemberModal
-          isOpen={isOpen}
-          isError={isError}
-          close={handleClose}
-          onSave={handleAddTeamMember}
-          isLoading={isPending}
-          formValues={formValues}
-          handleChangeForm={handleChangeForm}
-        />
-      )}
-    </>
-  );
-};
-
-export default AddNewTeamMemberTrigger;
diff --git a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/index.js b/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/index.js
deleted file mode 100644
index ee91c5f5..00000000
--- a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import AddNewTeamMemberModal from './AddNewTeamMemberModal';
-import AddNewTeamMemberTrigger from './AddNewTeamMemberTrigger';
-
-export { AddNewTeamMemberModal, AddNewTeamMemberTrigger };
diff --git a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/messages.ts b/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/messages.ts
deleted file mode 100644
index 05e28d5e..00000000
--- a/src/authz-module/libraries-manager/components/AddNewTeamMemberModal/messages.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'libraries.authz.manage.add.member.title': {
-    id: 'libraries.authz.manage.add.member.title',
-    defaultMessage: 'Add New Team Member',
-    description: 'Title for the add new team member modal',
-  },
-  'libraries.authz.manage.add.member.users.label': {
-    id: 'libraries.authz.manage.add.member.users.label',
-    defaultMessage: 'Add users by username or email',
-    description: 'Label for the users input field in the add new team member modal',
-  },
-  'libraries.authz.manage.add.member.users.placeholder': {
-    id: 'libraries.authz.manage.add.member.users.placeholder',
-    defaultMessage: 'Enter one or more email addresses or usernames, comma-separated.',
-    description: 'Placeholder for the users input field in the add new team member modal',
-  },
-  'libraries.authz.manage.add.member.roles.label': {
-    id: 'libraries.authz.manage.add.member.roles.label',
-    defaultMessage: 'Roles',
-    description: 'Label for the roles select field in the add new team member modal',
-  },
-  'libraries.authz.manage.add.member.invalid.users': {
-    id: 'libraries.authz.manage.add.member.invalid.users',
-    defaultMessage: 'The following users could not be found:',
-    description: 'Error message for invalid users in the add new team member modal',
-  },
-  'libraries.authz.manage.add.member.select.default': {
-    id: 'libraries.authz.manage.add.member.select.default',
-    defaultMessage: 'Select a role',
-    description: 'Default option for the roles select field in the add new team member modal',
-  },
-  'libraries.authz.manage.cancel.button': {
-    id: 'libraries.authz.manage.cancel.button',
-    defaultMessage: 'Cancel',
-    description: 'Libraries AuthZ cancel button title',
-  },
-  'libraries.authz.manage.saving.button': {
-    id: 'libraries.authz.manage.saving.button',
-    defaultMessage: 'Saving...',
-    description: 'Libraries AuthZ saving button title',
-  },
-  'libraries.authz.manage.save.button': {
-    id: 'libraries.authz.manage.save.button',
-    defaultMessage: 'Save',
-    description: 'Libraries AuthZ save button title',
-  },
-  'libraries.authz.manage.add.member.description': {
-    id: 'libraries.authz.manage.add.member.description',
-    defaultMessage: 'Add new members to this library\'s team and assign them a role to define their permissions.',
-    description: 'Description for the add new team member modal',
-  },
-  'libraries.authz.manage.add.member.success': {
-    id: 'libraries.authz.manage.add.member.success',
-    defaultMessage: '{count, plural, one {# team member added successfully} other {# team members added successfully}} ({userIds})',
-    description: 'Success message when adding new team members',
-  },
-  'libraries.authz.manage.add.member.failure.not.found': {
-    id: 'libraries.authz.manage.add.member.failure.not.found',
-    defaultMessage: '<Bold>We couldn\'t find a user for {count, plural, one {# email address or username} other {# email addresses or usernames}}.</Bold><Br></Br> Please check the values ({userIds}) and try again, or invite them to join your organization first.',
-    description: 'Error message in case of user not found when adding new team members',
-  },
-  'libraries.authz.manage.add.member.failure.generic': {
-    id: 'libraries.authz.manage.add.member.failure.generic',
-    defaultMessage: '<Bold>We couldn\'t assign the role to {count, plural, one {team member} other {team members}} ({userIds})}.</Bold><Br></Br> Please check the values and try again.',
-    description: 'Generic error message when adding new team members',
-  },
-  'libraries.authz.manage.assign.role.existing': {
-    id: 'libraries.authz.manage.assign.existing',
-    defaultMessage: 'The {count, plural, one {user already has} other {users already have}} the role ({userIds}).',
-    description: 'Libraries AuthZ assign existing role',
-  },
-  'libraries.authz.manage.tooltip.roles.extra.info': {
-    id: 'libraries.authz.manage.tooltip.roles.extra.info',
-    defaultMessage: 'View detailed permissions for each role.',
-    description: 'Invite the user to check a detailed view of permissions',
-  },
-});
-
-export default messages;
diff --git a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleModal.test.tsx b/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleModal.test.tsx
deleted file mode 100644
index e8780570..00000000
--- a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleModal.test.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { Role } from 'types';
-import AssignNewRoleModal from './AssignNewRoleModal';
-
-describe('AssignNewRoleModal', () => {
-  const defaultProps = {
-    isOpen: true,
-    isLoading: false,
-    roleOptions: [
-      {
-        role: 'instructor',
-        name: 'Instructor',
-        description: 'Can create and edit content',
-        userCount: 5,
-        permissions: ['view', 'edit'],
-      },
-      {
-        role: 'admin',
-        name: 'Administrator',
-        description: 'Full access to the library',
-        userCount: 2,
-        permissions: ['view', 'edit', 'delete', 'manage'],
-      },
-      {
-        role: 'viewer',
-        name: 'Viewer',
-        description: 'Can only view content',
-        userCount: 10,
-        permissions: ['view'],
-      },
-    ] as Role[],
-    selectedRole: '',
-    close: jest.fn(),
-    onSave: jest.fn(),
-    handleChangeSelectedRole: jest.fn(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  const renderComponent = (props = {}) => {
-    const finalProps = { ...defaultProps, ...props };
-    return renderWrapper(<AssignNewRoleModal {...finalProps} />);
-  };
-
-  describe('Modal Visibility', () => {
-    it('renders modal when isOpen is true', () => {
-      renderComponent({ isOpen: true });
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument();
-      expect(screen.getByText('Add New Role')).toBeInTheDocument();
-    });
-
-    it('does not render modal when isOpen is false', () => {
-      renderComponent({ isOpen: false });
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      expect(screen.queryByText('Add New Role')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Modal Structure', () => {
-    it('renders modal header with correct title', () => {
-      renderComponent({ isOpen: true });
-
-      expect(screen.getByText('Add New Role')).toBeInTheDocument();
-      expect(screen.getByRole('dialog')).toBeInTheDocument();
-    });
-
-    it('renders close button in header', () => {
-      renderComponent();
-
-      expect(screen.getByRole('button', { name: /close/i })).toBeInTheDocument();
-    });
-  });
-
-  describe('Role Selection Form', () => {
-    it('renders role selection form with correct label', () => {
-      renderComponent();
-
-      expect(screen.getByText('Roles')).toBeInTheDocument();
-      expect(screen.getByRole('combobox')).toBeInTheDocument();
-    });
-
-    it('renders default option', () => {
-      renderComponent();
-
-      expect(screen.getByText('Select a role')).toBeInTheDocument();
-      expect(screen.getByRole('option', { name: 'Select a role' })).toBeDisabled();
-    });
-
-    it('renders all role options', () => {
-      renderComponent();
-
-      defaultProps.roleOptions.forEach((role) => {
-        expect(screen.getByRole('option', { name: role.name })).toBeInTheDocument();
-      });
-    });
-
-    it('displays selected role correctly', () => {
-      renderComponent({ selectedRole: 'instructor' });
-
-      const selectElement = screen.getByRole('combobox');
-      expect(selectElement).toHaveValue('instructor');
-    });
-
-    it('calls handleChangeSelectedRole when role selection changes', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const selectElement = screen.getByRole('combobox');
-      await user.selectOptions(selectElement, 'admin');
-
-      expect(defaultProps.handleChangeSelectedRole).toHaveBeenCalled();
-    });
-  });
-
-  describe('Action Buttons', () => {
-    it('renders Cancel button with correct text', () => {
-      renderComponent();
-
-      expect(screen.getByRole('button', { name: /cancel/i })).toBeInTheDocument();
-    });
-
-    it('renders Save button with correct text when not loading', () => {
-      renderComponent({ isLoading: false });
-
-      expect(screen.getByRole('button', { name: /save/i })).toBeInTheDocument();
-    });
-
-    it('renders Save button with loading text when loading', () => {
-      renderComponent({ isLoading: true });
-
-      expect(screen.getByRole('button', { name: /saving/i })).toBeInTheDocument();
-    });
-
-    it('calls close when Cancel button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const cancelButton = screen.getByRole('button', { name: /cancel/i });
-      await user.click(cancelButton);
-
-      expect(defaultProps.close).toHaveBeenCalledTimes(1);
-    });
-
-    it('calls onSave when Save button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent({ selectedRole: 'instructor' });
-
-      const saveButton = screen.getByRole('button', { name: /save/i });
-      await user.click(saveButton);
-
-      expect(defaultProps.onSave).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('Button States', () => {
-    it('disables Save button when no role is selected', () => {
-      renderComponent({ selectedRole: '' });
-
-      const saveButton = screen.getByRole('button', { name: /save/i });
-      expect(saveButton).toBeDisabled();
-    });
-
-    it('enables Save button when role is selected and not loading', () => {
-      renderComponent({ selectedRole: 'instructor', isLoading: false });
-
-      const saveButton = screen.getByRole('button', { name: /save/i });
-      expect(saveButton).not.toBeDisabled();
-    });
-
-    it('disables Save button when loading', () => {
-      renderComponent({ selectedRole: 'instructor', isLoading: true });
-
-      const saveButton = screen.getByRole('button', { name: /saving/i });
-      expect(saveButton).toBeDisabled();
-    });
-
-    it('disables Cancel button when loading', () => {
-      renderComponent({ isLoading: true });
-
-      const cancelButton = screen.getByRole('button', { name: /cancel/i });
-      expect(cancelButton).toBeDisabled();
-    });
-
-    it('enables Cancel button when not loading', () => {
-      renderComponent({ isLoading: false });
-
-      const cancelButton = screen.getByRole('button', { name: /cancel/i });
-      expect(cancelButton).not.toBeDisabled();
-    });
-  });
-
-  describe('Modal Close Behavior', () => {
-    it('does not call close when modal header close is clicked during loading', async () => {
-      const user = userEvent.setup();
-      renderComponent({ isLoading: true });
-
-      const headerCloseButton = screen.getByRole('button', { name: /close/i });
-      await user.click(headerCloseButton);
-
-      expect(defaultProps.close).not.toHaveBeenCalled();
-    });
-
-    it('calls close when modal header close is clicked and not loading', async () => {
-      const user = userEvent.setup();
-      renderComponent({ isLoading: false });
-
-      const headerCloseButton = screen.getByRole('button', { name: /close/i });
-      await user.click(headerCloseButton);
-
-      expect(defaultProps.close).toHaveBeenCalledTimes(1);
-    });
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleModal.tsx b/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleModal.tsx
deleted file mode 100644
index 634f42fe..00000000
--- a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleModal.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  ActionRow, Button, Form, ModalDialog,
-} from '@openedx/paragon';
-import { Role } from 'types';
-import messages from '../messages';
-
-interface AssignNewRoleModalProps {
-  isOpen: boolean;
-  isLoading: boolean;
-  roleOptions: Role[];
-  selectedRole: string;
-  close: () => void;
-  onSave: () => void;
-  handleChangeSelectedRole: (e: React.ChangeEvent<HTMLTextAreaElement | HTMLSelectElement>) => void;
-}
-
-const AssignNewRoleModal = ({
-  isOpen, isLoading, selectedRole, roleOptions, close, onSave, handleChangeSelectedRole,
-}: AssignNewRoleModalProps) => {
-  const intl = useIntl();
-  return (
-    <ModalDialog
-      title={intl.formatMessage(messages['libraries.authz.manage.assign.new.role.title'])}
-      isOpen={isOpen}
-      onClose={isLoading ? () => {} : close}
-      size="lg"
-      variant="dark"
-      hasCloseButton
-      isBlocking
-      isOverflowVisible={false}
-      zIndex={5}
-    >
-      <ModalDialog.Header className="bg-primary-500 text-light-100">
-        <ModalDialog.Title>
-          {intl.formatMessage(messages['libraries.authz.manage.assign.new.role.title'])}
-        </ModalDialog.Title>
-      </ModalDialog.Header>
-
-      <ModalDialog.Body className="my-4">
-        <Form.Group controlId="role_options">
-          <Form.Label>{intl.formatMessage(messages['library.authz.manage.role.select.label'])}</Form.Label>
-          <Form.Control as="select" name="role" value={selectedRole} onChange={handleChangeSelectedRole}>
-            <option value="" disabled>Select a role</option>
-            {roleOptions.map((role) => <option key={role.role} value={role.role}>{role.name}</option>)}
-          </Form.Control>
-        </Form.Group>
-      </ModalDialog.Body>
-
-      <ModalDialog.Footer>
-        <ActionRow>
-          <ModalDialog.CloseButton variant="tertiary" disabled={isLoading}>
-            {intl.formatMessage(messages['libraries.authz.manage.cancel.button'])}
-          </ModalDialog.CloseButton>
-          <Button
-            className="px-4"
-            onClick={() => onSave()}
-            disabled={!selectedRole || isLoading}
-          >
-            {isLoading
-              ? intl.formatMessage(messages['libraries.authz.manage.saving.button'])
-              : intl.formatMessage(messages['libraries.authz.manage.save.button'])}
-          </Button>
-        </ActionRow>
-      </ModalDialog.Footer>
-    </ModalDialog>
-  );
-};
-
-export default AssignNewRoleModal;
diff --git a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.test.tsx b/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.test.tsx
deleted file mode 100644
index 069d762c..00000000
--- a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.test.tsx
+++ /dev/null
@@ -1,336 +0,0 @@
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { useAssignTeamMembersRole } from '@src/authz-module/data/hooks';
-import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
-import AssignNewRoleTrigger from './AssignNewRoleTrigger';
-
-jest.mock('@edx/frontend-platform/logging');
-
-jest.mock('@src/authz-module/libraries-manager/context', () => ({
-  useLibraryAuthZ: jest.fn(),
-}));
-
-jest.mock('@src/authz-module/data/hooks', () => ({
-  useAssignTeamMembersRole: jest.fn(),
-}));
-
-jest.mock('./AssignNewRoleModal', () => {
-  const MockAssignNewRoleModal = ({
-    isOpen,
-    close,
-    onSave,
-    isLoading,
-    roleOptions,
-    selectedRole,
-    handleChangeSelectedRole,
-  }: any) => (isOpen ? (
-    <div role="dialog" aria-label="Assign New Role">
-      <h2>Add New Role</h2>
-      <select value={selectedRole} onChange={handleChangeSelectedRole} aria-label="Select role">
-        <option value="">Select a role</option>
-        {roleOptions.map((role: any) => (
-          <option key={role.role} value={role.role}>
-            {role.name}
-          </option>
-        ))}
-      </select>
-      <button type="button" onClick={onSave} disabled={isLoading} aria-label="Save role assignment">
-        {isLoading ? 'Saving...' : 'Save'}
-      </button>
-      <button type="button" onClick={close} aria-label="Cancel role assignment">
-        Cancel
-      </button>
-    </div>
-  ) : null);
-  MockAssignNewRoleModal.displayName = 'AssignNewRoleModal';
-  return MockAssignNewRoleModal;
-});
-
-const mockUseLibraryAuthZ = useLibraryAuthZ as jest.Mock;
-const mockUseAssignTeamMembersRole = useAssignTeamMembersRole as jest.Mock;
-
-describe('AssignNewRoleTrigger', () => {
-  const defaultProps = {
-    username: 'testuser',
-    libraryId: 'lib:test-library',
-    currentUserRoles: ['instructor'],
-  };
-
-  const mockRoles = [
-    {
-      role: 'instructor',
-      name: 'Instructor',
-      description: 'Can create and edit content',
-    },
-    {
-      role: 'admin',
-      name: 'Administrator',
-      description: 'Full access to the library',
-    },
-    {
-      role: 'viewer',
-      name: 'Viewer',
-      description: 'Can only view content',
-    },
-  ];
-
-  const mockMutate = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    mockUseLibraryAuthZ.mockReturnValue({
-      roles: mockRoles,
-    });
-
-    mockUseAssignTeamMembersRole.mockReturnValue({
-      mutate: mockMutate,
-      isPending: false,
-    });
-  });
-
-  const renderComponent = (props = {}) => {
-    const finalProps = { ...defaultProps, ...props };
-    return renderWrapper(<ToastManagerProvider><AssignNewRoleTrigger {...finalProps} /></ToastManagerProvider>);
-  };
-
-  describe('Initial Render', () => {
-    it('renders the trigger button with correct text', () => {
-      renderComponent();
-
-      expect(screen.getByRole('button', { name: /add new role/i })).toBeInTheDocument();
-    });
-
-    it('does not show modal initially', () => {
-      renderComponent();
-
-      expect(screen.queryByRole('dialog', { name: 'Assign New Role' })).not.toBeInTheDocument();
-    });
-
-    it('does not show toast initially', () => {
-      renderComponent();
-
-      expect(screen.queryByText(/role added successfully/i)).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Modal Interaction', () => {
-    it('opens modal when trigger button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      const triggerButton = screen.getByRole('button', { name: /add new role/i });
-      await user.click(triggerButton);
-
-      expect(screen.getByRole('dialog', { name: 'Assign New Role' })).toBeInTheDocument();
-      expect(screen.getByRole('heading', { name: /add new role/i })).toBeInTheDocument();
-    });
-
-    it('closes modal when cancel button is clicked', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      // Open modal
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-      expect(screen.getByRole('dialog', { name: 'Assign New Role' })).toBeInTheDocument();
-
-      // Close modal
-      await user.click(screen.getByRole('button', { name: 'Cancel role assignment' }));
-      expect(screen.queryByRole('dialog', { name: 'Assign New Role' })).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Role Selection and Assignment', () => {
-    it('updates selected role when role select changes', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-
-      const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-      await user.selectOptions(roleSelect, 'admin');
-
-      expect(roleSelect).toHaveValue('admin');
-    });
-
-    it('calls assignTeamMembersRole with correct data when save is clicked', async () => {
-      const choosenRole = mockRoles[1].role; // 'admin'
-      const user = userEvent.setup();
-      renderComponent();
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-
-      // Select a role
-      const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-      await user.selectOptions(roleSelect, choosenRole);
-
-      // Click save
-      await user.click(screen.getByRole('button', { name: 'Save role assignment' }));
-
-      expect(mockMutate).toHaveBeenCalledWith(
-        {
-          data: {
-            users: [defaultProps.username],
-            role: choosenRole,
-            scope: defaultProps.libraryId,
-          },
-        },
-        expect.objectContaining({
-          onSuccess: expect.any(Function),
-        }),
-      );
-    });
-
-    it('does not call assignTeamMembersRole if user already has the selected role', async () => {
-      const choosenRole = mockRoles[1].role; // 'admin'
-      const user = userEvent.setup();
-      renderComponent({ currentUserRoles: ['instructor', choosenRole] });
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-
-      // Select a role that user already has
-      const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-      await user.selectOptions(roleSelect, choosenRole);
-
-      await user.click(screen.getByRole('button', { name: 'Save role assignment' }));
-
-      // Should not call assignTeamMembersRole
-      expect(mockMutate).not.toHaveBeenCalled();
-      // Modal should be closed
-      expect(screen.queryByRole('dialog', { name: 'Assign New Role' })).not.toBeInTheDocument();
-    });
-  });
-
-  describe('Loading State', () => {
-    it('shows loading state in modal when assignment is pending', async () => {
-      mockUseAssignTeamMembersRole.mockReturnValue({
-        mutate: mockMutate,
-        isPending: true,
-      });
-
-      const user = userEvent.setup();
-      renderComponent();
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-
-      expect(screen.getByRole('button', { name: 'Save role assignment' })).toBeDisabled();
-      expect(screen.getByText('Saving...')).toBeInTheDocument();
-    });
-  });
-
-  describe('Success Handling', () => {
-    it('shows success toast after successful role assignment', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-
-      const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-      await user.selectOptions(roleSelect, 'admin');
-
-      await user.click(screen.getByRole('button', { name: 'Save role assignment' }));
-
-      // Simulate successful API call
-      const onSuccessCallback = mockMutate.mock.calls[0][1].onSuccess;
-      onSuccessCallback({ errors: [] });
-
-      await waitFor(() => {
-        expect(screen.getByText(/role added successfully/i)).toBeInTheDocument();
-      });
-    });
-
-    it('closes modal and resets role after successful assignment', async () => {
-      const user = userEvent.setup();
-      renderComponent();
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-
-      const roleSelect = screen.getByRole('combobox', { name: 'Select role' });
-      await user.selectOptions(roleSelect, 'admin');
-
-      await user.click(screen.getByRole('button', { name: 'Save role assignment' }));
-
-      // Simulate successful API call
-      const onSuccessCallback = mockMutate.mock.calls[0][1].onSuccess;
-      onSuccessCallback({ errors: [] });
-
-      await waitFor(() => {
-        expect(screen.queryByRole('dialog', { name: 'Assign New Role' })).not.toBeInTheDocument();
-      });
-
-      // Open modal again to check if role is reset
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-      expect(screen.getByRole('combobox', { name: 'Select role' })).toHaveValue('');
-    });
-  });
-
-  describe('Error handle', () => {
-    it('shows error toast when API fails to assign a role', async () => {
-      const user = userEvent.setup();
-
-      renderComponent();
-
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-      await user.selectOptions(screen.getByRole('combobox', { name: 'Select role' }), 'admin');
-      await user.click(screen.getByRole('button', { name: 'Save role assignment' }));
-
-      const { onSuccess } = mockMutate.mock.calls[0][1];
-      onSuccess({ errors: [{ error: 'role_assignment_error' }] });
-
-      await waitFor(() => {
-        expect(screen.getByText(/Something went wrong/i)).toBeInTheDocument();
-        expect(screen.getByRole('combobox', { name: 'Select role' })).toHaveValue(''); // role reset
-      });
-    });
-
-    it('shows error toast on API failure and allows retry', async () => {
-      const user = userEvent.setup();
-      const mockError = new Error('Network error');
-
-      // First call to mutate triggers onError
-      mockMutate.mockImplementationOnce((_vars, { onError }) => {
-        onError(mockError, _vars);
-      });
-
-      renderWrapper(
-        <ToastManagerProvider>
-          <AssignNewRoleTrigger
-            username="testuser"
-            libraryId="lib:test-library"
-            currentUserRoles={['instructor']}
-          />
-        </ToastManagerProvider>,
-      );
-
-      // Open modal and select a role
-      await user.click(screen.getByRole('button', { name: /add new role/i }));
-      await user.selectOptions(screen.getByRole('combobox', { name: 'Select role' }), 'admin');
-      await user.click(screen.getByRole('button', { name: 'Save role assignment' }));
-
-      // Wait for the error toast to appear with a retry button
-      await waitFor(() => {
-        expect(screen.getByText(/Something went wrong/i)).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: /retry/i })).toBeInTheDocument();
-      });
-
-      // Second call to mutate also fails
-      mockMutate.mockImplementationOnce((_vars, { onError }) => {
-        onError(new Error('Network error'), _vars);
-      });
-
-      // Click retry button
-      const retryButton = screen.getByRole('button', { name: /retry/i });
-      await user.click(retryButton);
-
-      // The retry toast should appear again
-      await waitFor(() => {
-        expect(screen.getAllByText(/Something went wrong/i).length).toBeGreaterThanOrEqual(1);
-      });
-
-      // Ensure mutate was called twice (original + retry)
-      expect(mockMutate).toHaveBeenCalledTimes(2);
-    });
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.tsx b/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.tsx
deleted file mode 100644
index 71aecb71..00000000
--- a/src/authz-module/libraries-manager/components/AssignNewRoleModal/AssignNewRoleTrigger.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { useState } from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Button, useToggle } from '@openedx/paragon';
-import { Plus } from '@openedx/paragon/icons';
-
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { useAssignTeamMembersRole } from '@src/authz-module/data/hooks';
-import { useToastManager } from '@src/components/ToastManager/ToastManagerContext';
-import AssignNewRoleModal from './AssignNewRoleModal';
-
-import messages from '../messages';
-import authZLibrariesMessages from '../../messages';
-
-interface AssignNewRoleTriggerProps {
-  username: string;
-  libraryId: string;
-  currentUserRoles: string[];
-}
-
-const AssignNewRoleTrigger = ({
-  username,
-  libraryId,
-  currentUserRoles,
-}: AssignNewRoleTriggerProps) => {
-  const intl = useIntl();
-  const [isOpen, open, close] = useToggle(false);
-  const { roles } = useLibraryAuthZ();
-  const {
-    showToast, showErrorToast, Bold, Br,
-  } = useToastManager();
-  const [newRole, setNewRole] = useState<string>('');
-
-  const { mutate: assignTeamMembersRole, isPending: isAssignTeamMembersRolePending } = useAssignTeamMembersRole();
-
-  const handleAddRole = () => {
-    const data = {
-      users: [username],
-      role: newRole,
-      scope: libraryId,
-    };
-
-    if (currentUserRoles.includes(newRole)) {
-      showToast({
-        message: intl.formatMessage(messages['libraries.authz.manage.assign.role.existing']),
-        type: 'success',
-      });
-      close();
-      setNewRole('');
-      return;
-    }
-
-    const runAssignRole = (variables = { data }) => {
-      assignTeamMembersRole(variables, {
-        onSuccess: (response) => {
-          const { errors } = response;
-
-          if (errors.length) {
-            showToast({
-              type: 'error',
-              message: intl.formatMessage(
-                authZLibrariesMessages['library.authz.team.toast.default.error.message'],
-                { Bold, Br },
-              ),
-            });
-            setNewRole('');
-            return;
-          }
-
-          showToast({
-            message: intl.formatMessage(messages['libraries.authz.manage.assign.role.success']),
-            type: 'success',
-          });
-          close();
-          setNewRole('');
-        },
-        onError: (error, retryVariables) => {
-          showErrorToast(error, () => runAssignRole(retryVariables));
-        },
-      });
-    };
-
-    runAssignRole();
-  };
-
-  return (
-    <>
-      <Button
-        key="authz-header-action-new-team-member"
-        iconBefore={Plus}
-        onClick={open}
-      >
-        {intl.formatMessage(messages['libraries.authz.manage.assign.new.role.title'])}
-      </Button>
-
-      {isOpen && (
-        <AssignNewRoleModal
-          isOpen={isOpen}
-          close={close}
-          onSave={handleAddRole}
-          isLoading={isAssignTeamMembersRolePending}
-          roleOptions={roles}
-          selectedRole={newRole}
-          handleChangeSelectedRole={(e) => setNewRole(e.target.value)}
-
-        />
-      )}
-    </>
-  );
-};
-
-export default AssignNewRoleTrigger;
diff --git a/src/authz-module/libraries-manager/components/AssignNewRoleModal/index.ts b/src/authz-module/libraries-manager/components/AssignNewRoleModal/index.ts
deleted file mode 100644
index 2f8d6091..00000000
--- a/src/authz-module/libraries-manager/components/AssignNewRoleModal/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import AssignNewRoleModal from './AssignNewRoleModal';
-import AssignNewRoleTrigger from './AssignNewRoleTrigger';
-
-export { AssignNewRoleModal, AssignNewRoleTrigger };
diff --git a/src/authz-module/libraries-manager/components/ConfirmDeletionModal.tsx b/src/authz-module/libraries-manager/components/ConfirmDeletionModal.tsx
deleted file mode 100644
index 6a996dee..00000000
--- a/src/authz-module/libraries-manager/components/ConfirmDeletionModal.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import {
-  ActionRow, AlertModal, Icon, ModalDialog, Stack,
-  StatefulButton,
-} from '@openedx/paragon';
-import { useIntl } from '@edx/frontend-platform/i18n';
-
-import { SpinnerSimple } from '@openedx/paragon/icons';
-import messages from './messages';
-
-interface ConfirmDeletionModalProps {
-  isOpen: boolean;
-  close: () => void;
-  onSave: () => void;
-  isDeleting?: boolean;
-  context: {
-    userName: string;
-    scope: string;
-    role: string;
-    rolesCount: number;
-  }
-}
-
-const ConfirmDeletionModal = ({
-  isOpen, close, onSave, isDeleting, context,
-}: ConfirmDeletionModalProps) => {
-  const intl = useIntl();
-  return (
-    <AlertModal
-      title={intl.formatMessage(messages['library.authz.team.remove.user.modal.title'])}
-      isOpen={isOpen}
-      onClose={close}
-      size="lg"
-      footerNode={(
-        <ActionRow>
-          <ModalDialog.CloseButton variant="tertiary">
-            {intl.formatMessage(messages['libraries.authz.manage.cancel.button'])}
-          </ModalDialog.CloseButton>
-          <StatefulButton
-            className="px-4"
-            variant="danger"
-            labels={{
-              default: intl.formatMessage(messages['libraries.authz.manage.remove.button']),
-              pending: intl.formatMessage(messages['libraries.authz.manage.removing.button']),
-            }}
-            icons={{
-              pending: <Icon src={SpinnerSimple} />,
-            }}
-            state={isDeleting ? 'pending' : 'default'}
-            onClick={() => onSave()}
-            disabledStates={['pending']}
-          />
-        </ActionRow>
-      )}
-      isOverflowVisible={false}
-    >
-      <Stack gap={3}>
-        <p>{intl.formatMessage(messages['library.authz.team.remove.user.modal.body.1'], {
-          userName: context.userName,
-          scope: context.scope,
-          role: context.role,
-        })}
-        </p>
-        {context.rolesCount === 1 && (
-        <p>{intl.formatMessage(messages['library.authz.team.remove.user.modal.body.2'])}</p>
-        )}
-        <p>{intl.formatMessage(messages['library.authz.team.remove.user.modal.body.3'])}</p>
-      </Stack>
-
-    </AlertModal>
-  );
-};
-
-export default ConfirmDeletionModal;
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/Cells.test.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/Cells.test.tsx
deleted file mode 100644
index ce627b32..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/Cells.test.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { IntlProvider } from '@edx/frontend-platform/i18n';
-import { useNavigate } from 'react-router-dom';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { useTeamMembers } from '@src/authz-module/data/hooks';
-import {
-  EmailCell,
-  NameCell,
-  ActionCell,
-  RolesCell,
-} from './Cells';
-
-jest.mock('react-router-dom', () => ({
-  useNavigate: jest.fn(),
-}));
-
-jest.mock('@src/authz-module/libraries-manager/context', () => ({
-  useLibraryAuthZ: jest.fn(),
-}));
-
-jest.mock('@src/authz-module/data/hooks', () => ({
-  useTeamMembers: jest.fn(),
-}));
-
-jest.mock('@src/authz-module/hooks/useQuerySettings', () => ({
-  useQuerySettings: jest.fn(() => ({
-    querySettings: { page: 1, limit: 10 },
-  })),
-}));
-
-const mockNavigate = useNavigate as jest.Mock;
-const mockUseLibraryAuthZ = useLibraryAuthZ as jest.Mock;
-const mockUseTeamMembers = useTeamMembers as jest.Mock;
-
-const renderWithIntl = (component: React.ReactElement) => render(
-  <IntlProvider locale="en" messages={{}}>
-    {component}
-  </IntlProvider>,
-);
-
-const mockTeamMember = {
-  username: 'john.doe',
-  fullName: 'John Doe',
-  email: 'john.doe@example.com',
-  roles: ['instructor', 'author'],
-  createdAt: '2023-01-01T00:00:00Z',
-};
-
-const mockSkeletonMember = {
-  username: 'skeleton',
-  fullName: '',
-  email: '',
-  roles: [],
-  createdAt: '',
-};
-
-const mockCellProps = {
-  row: { original: mockTeamMember },
-};
-
-const mockSkeletonCellProps = {
-  row: { original: mockSkeletonMember },
-};
-
-describe('Table Cells', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseLibraryAuthZ.mockReturnValue({
-      username: 'current.user',
-      libraryId: 'lib123',
-      canManageTeam: true,
-      roles: [
-        { role: 'instructor', name: 'Instructor' },
-        { role: 'author', name: 'Author' },
-      ],
-    });
-    mockUseTeamMembers.mockReturnValue({ isLoading: false });
-    mockNavigate.mockReturnValue(jest.fn());
-  });
-
-  describe('EmailCell', () => {
-    it('displays user email', () => {
-      renderWithIntl(<EmailCell {...mockCellProps} />);
-      expect(screen.getByText('john.doe@example.com')).toBeInTheDocument();
-    });
-    it('shows loading skeleton for loading state', () => {
-      renderWithIntl(<EmailCell {...mockSkeletonCellProps} />);
-      expect(document.querySelector('.react-loading-skeleton')).toBeInTheDocument();
-    });
-  });
-
-  describe('NameCell', () => {
-    it('displays username for regular user', () => {
-      renderWithIntl(<NameCell {...mockCellProps} />);
-      expect(screen.getByText('john.doe')).toBeInTheDocument();
-    });
-
-    it('displays current user indicator for logged in user', () => {
-      const currentUserProps = {
-        ...mockCellProps,
-        row: { original: { ...mockTeamMember, username: 'current.user' } },
-      };
-      renderWithIntl(<NameCell {...currentUserProps} />);
-      expect(screen.getByText('current.user')).toBeInTheDocument();
-      expect(screen.getByText('current.user').parentElement).toBeInTheDocument();
-    });
-    it('shows loading skeleton for loading state', () => {
-      renderWithIntl(<NameCell {...mockSkeletonCellProps} />);
-      expect(document.querySelector('.react-loading-skeleton')).toBeInTheDocument();
-    });
-  });
-
-  describe('ActionCell', () => {
-    it('renders edit button for manageable team member', () => {
-      renderWithIntl(<ActionCell {...mockCellProps} />);
-      const editButton = screen.getByRole('button');
-      expect(editButton).toBeInTheDocument();
-      expect(document.querySelector('.pgn__icon')).toBeInTheDocument();
-      expect(document.querySelector('svg')).toBeInTheDocument();
-    });
-
-    it('navigates to user page when edit button is clicked', async () => {
-      const user = userEvent.setup();
-      const navigateMock = jest.fn();
-      mockNavigate.mockReturnValue(navigateMock);
-      renderWithIntl(<ActionCell {...mockCellProps} />);
-      const editButton = screen.getByRole('button');
-      await user.click(editButton);
-      expect(navigateMock).toHaveBeenCalledWith('/authz/libraries/lib123/john.doe');
-    });
-
-    it('does not render edit button for current user', () => {
-      const currentUserProps = {
-        ...mockCellProps,
-        row: { original: { ...mockTeamMember, username: 'current.user' } },
-      };
-      renderWithIntl(<ActionCell {...currentUserProps} />);
-      expect(screen.queryByRole('button')).not.toBeInTheDocument();
-    });
-
-    it('does not render edit button when user cannot manage team', () => {
-      mockUseLibraryAuthZ.mockReturnValue({
-        username: 'current.user',
-        libraryId: 'lib123',
-        canManageTeam: false,
-        roles: [],
-      });
-      renderWithIntl(<ActionCell {...mockCellProps} />);
-      expect(screen.queryByRole('button')).not.toBeInTheDocument();
-    });
-
-    it('does not render edit button during loading', () => {
-      mockUseTeamMembers.mockReturnValue({ isLoading: true });
-
-      renderWithIntl(<ActionCell {...mockCellProps} />);
-      expect(screen.queryByRole('button')).not.toBeInTheDocument();
-    });
-  });
-
-  describe('RolesCell', () => {
-    it('displays role chips for user roles', () => {
-      renderWithIntl(<RolesCell {...mockCellProps} />);
-      expect(screen.getByText('Instructor')).toBeInTheDocument();
-      expect(screen.getByText('Author')).toBeInTheDocument();
-    });
-
-    it('shows loading skeleton for loading state', () => {
-      renderWithIntl(<RolesCell {...mockSkeletonCellProps} />);
-      expect(document.querySelector('.react-loading-skeleton')).toBeInTheDocument();
-    });
-
-    it('handles user with no roles', () => {
-      const noRolesProps = {
-        ...mockCellProps,
-        row: { original: { ...mockTeamMember, roles: [] } },
-      };
-      renderWithIntl(<RolesCell {...noRolesProps} />);
-      expect(screen.queryByText('Instructor')).not.toBeInTheDocument();
-      expect(screen.queryByText('Author')).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/Cells.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/Cells.tsx
deleted file mode 100644
index 9f0faa43..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/Cells.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useIntl } from '@edx/frontend-platform/i18n';
-import { Button, Chip, Skeleton } from '@openedx/paragon';
-import { Edit } from '@openedx/paragon/icons';
-import { TableCellValue, TeamMember } from '@src/types';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { useNavigate } from 'react-router-dom';
-import { useTeamMembers } from '@src/authz-module/data/hooks';
-import { SKELETON_ROWS } from '@src/authz-module/constants';
-import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
-import messages from '../messages';
-
-type CellProps = TableCellValue<TeamMember>;
-
-const EmailCell = ({ row }: CellProps) => (row.original?.username === SKELETON_ROWS[0].username ? (
-  <Skeleton width="180px" />
-) : (
-  row.original.email
-));
-
-const NameCell = ({ row }: CellProps) => {
-  const intl = useIntl();
-  const { username } = useLibraryAuthZ();
-
-  if (row.original.username === SKELETON_ROWS[0].username) {
-    return <Skeleton width="180px" />;
-  }
-
-  if (row.original.username === username) {
-    return (
-      <span>
-        {username}
-        <span className="text-gray-500">{intl.formatMessage(messages['library.authz.team.table.username.current'])}</span>
-      </span>
-    );
-  }
-  return row.original.username;
-};
-
-const ActionCell = ({ row }: CellProps) => {
-  const intl = useIntl();
-  const {
-    libraryId, canManageTeam, username,
-  } = useLibraryAuthZ();
-  const navigate = useNavigate();
-  const { querySettings } = useQuerySettings();
-  const { isLoading } = useTeamMembers(libraryId, querySettings);
-  return (
-    canManageTeam && row.original.username !== username && !isLoading ? (
-      <Button
-        iconBefore={Edit}
-        variant="link"
-        size="sm"
-        onClick={() => navigate(`/authz/libraries/${libraryId}/${row.original.username}`)}
-      >
-        {intl.formatMessage(messages['authz.libraries.team.table.edit.action'])}
-      </Button>
-    ) : null);
-};
-
-const RolesCell = ({ row }: CellProps) => {
-  const { roles } = useLibraryAuthZ();
-  const roleLabels = roles.reduce((acc, role) => ({ ...acc, [role.role]: role.name }), {} as Record<string, string>);
-  return (row.original.username === SKELETON_ROWS[0].username ? (
-    <Skeleton width="80px" />
-  ) : (
-    row.original.roles.map((role) => (
-      <Chip key={`${row.original.username}-role-${role}`}>{roleLabels[role]}</Chip>
-    ))
-  ));
-};
-
-export {
-  EmailCell, NameCell, ActionCell, RolesCell,
-};
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/MultipleChoiceFilter.test.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/MultipleChoiceFilter.test.tsx
deleted file mode 100644
index c0c9e30a..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/MultipleChoiceFilter.test.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import MultipleChoiceFilter from './MultipleChoiceFilter';
-
-describe('MultipleChoiceFilter', () => {
-  const mockSetFilter = jest.fn();
-
-  const defaultProps = {
-    Header: 'Test Filter',
-    filterChoices: [
-      { name: 'Option 1', number: 5, value: 'option1' },
-      { name: 'Option 2', number: 3, value: 'option2' },
-      { name: 'Option 3', number: 0, value: 'option3' },
-    ],
-    filterValue: [],
-    setFilter: mockSetFilter,
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should render dropdown with correct header', () => {
-    render(<MultipleChoiceFilter {...defaultProps} />);
-
-    expect(screen.getByRole('button')).toBeInTheDocument();
-    expect(screen.getByText('Test Filter')).toBeInTheDocument();
-  });
-
-  it('should render FilterList icon', () => {
-    render(<MultipleChoiceFilter {...defaultProps} />);
-
-    const button = screen.getByRole('button');
-    const icon = button.querySelector('svg');
-    expect(icon).toBeInTheDocument();
-  });
-
-  it('should show all filter choices when dropdown is opened', async () => {
-    const user = userEvent.setup();
-
-    render(<MultipleChoiceFilter {...defaultProps} />);
-
-    await user.click(screen.getByRole('button'));
-
-    expect(screen.getByText('Option 1 (5)')).toBeInTheDocument();
-    expect(screen.getByText('Option 2 (3)')).toBeInTheDocument();
-    expect(screen.getByText('Option 3 (0)')).toBeInTheDocument();
-  });
-
-  it('should add value to filter when checkbox is checked', async () => {
-    const user = userEvent.setup();
-    render(<MultipleChoiceFilter {...defaultProps} />);
-
-    await user.click(screen.getByRole('button'));
-
-    const checkbox1 = screen.getByLabelText('Option 1');
-    await user.click(checkbox1);
-
-    expect(mockSetFilter).toHaveBeenCalledWith(['option1']);
-  });
-
-  it('should remove value from filter when checkbox is unchecked', async () => {
-    const user = userEvent.setup();
-    const propsWithSelectedValue = {
-      ...defaultProps,
-      filterValue: ['option1', 'option2'],
-    };
-
-    render(<MultipleChoiceFilter {...propsWithSelectedValue} />);
-
-    await user.click(screen.getByRole('button'));
-
-    const checkbox1 = screen.getByLabelText('Option 1');
-    await user.click(checkbox1);
-
-    expect(mockSetFilter).toHaveBeenCalledWith(['option2']);
-  });
-
-  it('should show checked checkboxes for pre-selected values', async () => {
-    const user = userEvent.setup();
-    const propsWithSelectedValues = {
-      ...defaultProps,
-      filterValue: ['option1', 'option3'],
-    };
-
-    render(<MultipleChoiceFilter {...propsWithSelectedValues} />);
-
-    await user.click(screen.getByRole('button'));
-
-    const checkbox1 = screen.getByLabelText('Option 1');
-    const checkbox2 = screen.getByLabelText('Option 2');
-    const checkbox3 = screen.getByLabelText('Option 3');
-
-    expect(checkbox1).toBeChecked();
-    expect(checkbox2).not.toBeChecked();
-    expect(checkbox3).toBeChecked();
-  });
-
-  it('should call setFilter with correct array when adding to existing selections', async () => {
-    const user = userEvent.setup();
-    const propsWithExistingSelection = {
-      ...defaultProps,
-      filterValue: ['option2'],
-    };
-
-    render(<MultipleChoiceFilter {...propsWithExistingSelection} />);
-
-    await user.click(screen.getByRole('button'));
-
-    const checkbox1 = screen.getByLabelText('Option 1');
-    await user.click(checkbox1);
-
-    expect(mockSetFilter).toHaveBeenCalledWith(['option2', 'option1']);
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/MultipleChoiceFilter.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/MultipleChoiceFilter.tsx
deleted file mode 100644
index 3821f05b..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/MultipleChoiceFilter.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-  Dropdown, Form, Icon, Stack,
-} from '@openedx/paragon';
-import { FilterList } from '@openedx/paragon/icons';
-
-interface MultipleChoiceFilterProps {
-  Header: string;
-  filterChoices: Array<{ name: string; number: number; value: string }>;
-  filterValue: string[] | undefined;
-  setFilter: (value: string[]) => void;
-}
-
-const MultipleChoiceFilter = ({
-  Header, filterChoices, filterValue, setFilter,
-}: MultipleChoiceFilterProps) => {
-  const checkedBoxes = filterValue || [];
-
-  const changeCheckbox = (value) => {
-    if (checkedBoxes.includes(value)) {
-      const newCheckedBoxes = checkedBoxes.filter((val) => val !== value);
-      return setFilter(newCheckedBoxes);
-    }
-    checkedBoxes.push(value);
-    return setFilter(checkedBoxes);
-  };
-
-  return (
-    <Dropdown>
-      <Dropdown.Toggle variant="outline-primary">
-        <Stack direction="horizontal" gap={2}>
-          <Icon color="primary" src={FilterList} />
-          {Header}
-        </Stack>
-      </Dropdown.Toggle>
-
-      <Dropdown.Menu>
-        <Form.CheckboxSet
-          className="pgn__dropdown-filter-checkbox-group"
-          name={Header}
-          aria-label={Header}
-          value={checkedBoxes}
-        >
-          {filterChoices.map(({
-            name, number, value,
-          }) => (
-            <Form.Checkbox
-              className="m-2"
-              key={name}
-              value={value}
-              onChange={() => changeCheckbox(value)}
-              aria-label={name}
-            >
-              <Stack direction="horizontal" gap={2}>
-                {`${name} (${number || 0})`}
-              </Stack>
-            </Form.Checkbox>
-          ))}
-        </Form.CheckboxSet>
-      </Dropdown.Menu>
-    </Dropdown>
-  );
-};
-
-export default MultipleChoiceFilter;
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/SearchFilter.test.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/SearchFilter.test.tsx
deleted file mode 100644
index f216f649..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/SearchFilter.test.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useState } from 'react';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import SearchFilter from './SearchFilter';
-
-describe('SearchFilter', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  const SearchFilterWrapper = ({
-    initFilterValue = '', customPlaceholder = 'Search placeholder',
-  }:{ initFilterValue?: string; customPlaceholder?:string }) => {
-    const [filter, setFilter] = useState(initFilterValue);
-    return (
-      <SearchFilter
-        filterValue={filter}
-        setFilter={setFilter}
-        placeholder={customPlaceholder}
-      />
-    );
-  };
-
-  it('should render search input with correct placeholder', () => {
-    render(<SearchFilterWrapper />);
-
-    const input = screen.getByPlaceholderText('Search placeholder');
-    expect(input).toBeInTheDocument();
-    expect(input).toHaveAttribute('type', 'text');
-  });
-
-  it('should display empty value when filterValue is undefined', () => {
-    render(<SearchFilterWrapper initFilterValue={undefined} />);
-
-    const input = screen.getByPlaceholderText('Search placeholder');
-    expect(input).toHaveValue('');
-  });
-
-  it('should display filterValue if provided', () => {
-    render(<SearchFilterWrapper initFilterValue="test search" />);
-
-    const input = screen.getByPlaceholderText('Search placeholder');
-    expect(input).toHaveValue('test search');
-  });
-
-  it('should call setFilter with input value when typing', async () => {
-    const user = userEvent.setup();
-    render(<SearchFilterWrapper />);
-
-    const input = screen.getByPlaceholderText('Search placeholder');
-    await user.click(input);
-    await user.type(input, 'new search term');
-
-    expect(input).toHaveValue('new search term');
-  });
-
-  it('should clear the input correctly', async () => {
-    const user = userEvent.setup();
-    render(<SearchFilterWrapper initFilterValue="existing value" />);
-
-    const input = screen.getByPlaceholderText('Search placeholder');
-    await user.click(input);
-    await user.clear(input);
-    expect(input).toHaveValue('');
-  });
-
-  it('should handle multiple character input correctly', async () => {
-    const user = userEvent.setup();
-
-    render(<SearchFilterWrapper />);
-
-    const input = screen.getByPlaceholderText('Search placeholder');
-    await user.click(input);
-
-    // Type multiple characters
-    await user.type(input, 'a');
-    expect(input).toHaveValue('a');
-
-    await user.type(input, 'b');
-    expect(input).toHaveValue('ab');
-
-    await user.type(input, 'c');
-    expect(input).toHaveValue('abc');
-  });
-
-  it('should handle different placeholder text', () => {
-    const customPlaceholder = 'Enter search term here...';
-    render(<SearchFilterWrapper customPlaceholder={customPlaceholder} />);
-
-    const input = screen.getByPlaceholderText(customPlaceholder);
-    expect(input).toBeInTheDocument();
-    expect(input).toHaveAttribute('placeholder', customPlaceholder);
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/SearchFilter.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/SearchFilter.tsx
deleted file mode 100644
index f4d0febf..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/SearchFilter.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import {
-  Form,
-  Icon,
-} from '@openedx/paragon';
-import { Search } from '@openedx/paragon/icons';
-
-interface SearchFilterProps {
-  filterValue: string;
-  setFilter: (value: string) => void;
-  placeholder: string;
-}
-
-const SearchFilter = ({
-  filterValue, setFilter, placeholder,
-}: SearchFilterProps) => (
-  <Form.Control
-    className="mw-xs mr-0"
-    trailingElement={<Icon src={Search} />}
-    value={filterValue || ''}
-    type="text"
-    onChange={e => {
-      setFilter(e.target.value || undefined); // Set undefined to remove the filter entirely
-    }}
-    placeholder={placeholder}
-  />
-);
-
-export default SearchFilter;
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/SortDropdown.test.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/SortDropdown.test.tsx
deleted file mode 100644
index 298a2ed0..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/SortDropdown.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { DataTableContext } from '@openedx/paragon';
-import { renderWrapper } from '@src/setupTest';
-import SortDropdown from './SortDropdown';
-
-jest.mock('@edx/frontend-platform/i18n', () => jest.requireActual('@edx/frontend-platform/i18n'));
-
-describe('SortDropdown', () => {
-  const mockToggleSortBy = jest.fn();
-
-  const defaultDataTableState = {
-    sortBy: [],
-    filters: [],
-    pageSize: 10,
-    pageIndex: 0,
-  };
-
-  const mockDataTableContext = {
-    state: defaultDataTableState,
-    toggleSortBy: mockToggleSortBy,
-  };
-
-  const renderSortDropdown = (contextOverrides = {}) => {
-    const contextValue = {
-      ...mockDataTableContext,
-      ...contextOverrides,
-    };
-
-    return renderWrapper(
-      <DataTableContext.Provider value={contextValue}>
-        <SortDropdown />
-      </DataTableContext.Provider>,
-    );
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should render the sort dropdown with default label', () => {
-    renderSortDropdown();
-
-    expect(screen.getByRole('button')).toBeInTheDocument();
-    expect(screen.getByText('Sort')).toBeInTheDocument();
-  });
-
-  it('should render all sort options when dropdown is opened', async () => {
-    const user = userEvent.setup();
-    renderSortDropdown();
-
-    const toggleButton = screen.getByRole('button');
-    await user.click(toggleButton);
-
-    expect(screen.getByText('Name A-Z')).toBeInTheDocument();
-    expect(screen.getByText('Name Z-A')).toBeInTheDocument();
-  });
-
-  it('should display current sort when a sort is active', () => {
-    const contextWithSort = {
-      state: {
-        ...defaultDataTableState,
-        sortBy: [{ id: 'username', desc: false }],
-      },
-    };
-
-    renderSortDropdown(contextWithSort);
-
-    expect(screen.getByText('Name A-Z')).toBeInTheDocument();
-  });
-
-  it('should display descending sort correctly', () => {
-    const contextWithSort = {
-      state: {
-        ...defaultDataTableState,
-        sortBy: [{ id: 'username', desc: true }],
-      },
-    };
-
-    renderSortDropdown(contextWithSort);
-
-    expect(screen.getByText('Name Z-A')).toBeInTheDocument();
-  });
-
-  it('should handle sort selection and call toggleSortBy', async () => {
-    const user = userEvent.setup();
-    renderSortDropdown();
-
-    const toggleButton = screen.getByRole('button');
-    await user.click(toggleButton);
-
-    const nameAZOption = screen.getByText('Name A-Z');
-
-    await user.click(nameAZOption);
-
-    expect(mockToggleSortBy).toHaveBeenCalledWith('username', false);
-
-    const nameZAOption = screen.getByText('Name Z-A');
-
-    await user.click(toggleButton);
-    await user.click(nameZAOption);
-
-    expect(mockToggleSortBy).toHaveBeenCalledWith('username', true);
-  });
-
-  it('should mark the active sort option as active', async () => {
-    const user = userEvent.setup();
-    const contextWithSort = {
-      state: {
-        ...defaultDataTableState,
-        sortBy: [{ id: 'username', desc: false }],
-      },
-    };
-
-    renderSortDropdown(contextWithSort);
-
-    const toggleButton = screen.getByRole('button');
-    await user.click(toggleButton);
-
-    // Get all elements with "Name A-Z" text and find the dropdown item
-    const nameAZOptions = screen.getAllByText('Name A-Z');
-    const dropdownItem = nameAZOptions.find(element => element.closest('.dropdown-item'));
-    expect(dropdownItem?.closest('.dropdown-item')).toHaveClass('active');
-  });
-
-  it('should handle undefined sortBy', () => {
-    const contextWithUndefinedSort = {
-      state: {
-        ...defaultDataTableState,
-        sortBy: undefined,
-      },
-    };
-
-    renderSortDropdown(contextWithUndefinedSort);
-
-    expect(screen.getByText('Sort')).toBeInTheDocument();
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/SortDropdown.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/SortDropdown.tsx
deleted file mode 100644
index 7f2bef04..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/SortDropdown.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import {
-  useContext, useState, useMemo, useCallback,
-  useEffect,
-  FC,
-} from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  DataTableContext,
-  Dropdown,
-  Icon,
-  Stack,
-} from '@openedx/paragon';
-import { SwapVert } from '@openedx/paragon/icons';
-
-interface SortOption {
-  id: string;
-  desc: boolean;
-  label: string;
-}
-
-interface SortByOptions {
-  [key: string]: Omit<SortOption, 'label'>;
-}
-
-const SORT_BY_OPTIONS: SortByOptions = {
-  'name-a-z': { id: 'username', desc: false },
-  'name-z-a': { id: 'username', desc: true },
-};
-
-const SortDropdown: FC = () => {
-  const intl = useIntl();
-  const { toggleSortBy, state } = useContext<DataTableContext>(DataTableContext);
-  const [sortOrder, setSortOrder] = useState<string | undefined>(undefined);
-
-  const SORT_LABELS: Record<string, string> = useMemo(() => ({
-    'name-a-z': intl.formatMessage({ id: 'authz.libraries.team.table.sort.name-a-z', defaultMessage: 'Name A-Z' }),
-    'name-z-a': intl.formatMessage({ id: 'authz.libraries.team.table.sort.name-z-a', defaultMessage: 'Name Z-A' }),
-  }), [intl]);
-
-  const currentSort = useMemo(() => {
-    if (!state?.sortBy?.length) { return undefined; }
-
-    const activeSortBy = state.sortBy[0];
-    return Object.entries(SORT_BY_OPTIONS).find(
-      ([, option]) => option.id === activeSortBy.id && option.desc === activeSortBy.desc,
-    )?.[0]; // return the key
-  }, [state?.sortBy]);
-
-  useEffect(() => {
-    setSortOrder(currentSort);
-  }, [currentSort]);
-
-  const handleChangeSortBy = useCallback((newSortOrder: string) => {
-    setSortOrder(newSortOrder);
-    const { id, desc } = SORT_BY_OPTIONS[newSortOrder];
-    toggleSortBy(id, desc);
-  }, [toggleSortBy]);
-
-  const sortOptions = useMemo(
-    () => Object.entries(SORT_BY_OPTIONS).map(([key, option]) => ({
-      key,
-      ...option,
-      label: SORT_LABELS[key],
-    })),
-    [SORT_LABELS],
-  );
-
-  const currentSortLabel = sortOrder ? SORT_LABELS[sortOrder] : 'Sort';
-
-  return (
-    <Dropdown onSelect={handleChangeSortBy}>
-      <Dropdown.Toggle variant="outline-primary">
-        <Stack direction="horizontal" gap={2}>
-          <Icon color="primary" src={SwapVert} />
-          {currentSortLabel}
-        </Stack>
-      </Dropdown.Toggle>
-
-      <Dropdown.Menu>
-        {sortOptions.map(({ key, label }) => (
-          <Dropdown.Item
-            key={key}
-            active={sortOrder === key}
-            eventKey={key}
-          >
-            {label}
-          </Dropdown.Item>
-        ))}
-      </Dropdown.Menu>
-    </Dropdown>
-  );
-};
-
-export default SortDropdown;
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/TableControlBar.test.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/TableControlBar.test.tsx
deleted file mode 100644
index 0c814776..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/TableControlBar.test.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { screen } from '@testing-library/react';
-import {
-  DataTableContext, CheckboxFilter, TextFilter,
-} from '@openedx/paragon';
-import { renderWrapper } from '@src/setupTest';
-import userEvent from '@testing-library/user-event';
-import TableControlBar from './TableControlBar';
-
-jest.mock('./MultipleChoiceFilter', () => {
-  const MockMultipleChoiceFilter = (props: { id?: string; accessor?: string }) => (
-    <div role="group" aria-label={`Filter by ${props.id || props.accessor}`}>
-      Multiple Choice Filter
-    </div>
-  );
-  MockMultipleChoiceFilter.displayName = 'MultipleChoiceFilter';
-  return MockMultipleChoiceFilter;
-});
-
-jest.mock('./SortDropdown', () => {
-  const MockSortDropdown = () => (
-    <div role="group" aria-label="Sort options">
-      Sort Dropdown
-    </div>
-  );
-  MockSortDropdown.displayName = 'SortDropdown';
-  return MockSortDropdown;
-});
-
-jest.mock('./SearchFilter', () => {
-  // eslint-disable-next-line react/prop-types
-  const MockSearchFilter = (props) => (
-    <div role="search" aria-label="Search filter">
-      <input
-        // eslint-disable-next-line react/prop-types
-        placeholder={props.placeholder}
-        // eslint-disable-next-line react/prop-types
-        value={props.filterValue || ''}
-        // eslint-disable-next-line react/prop-types
-        onChange={(e) => props.setFilter(e.target.value)}
-        aria-label="Search input"
-      />
-    </div>
-  );
-  MockSearchFilter.displayName = 'SearchFilter';
-  return MockSearchFilter;
-});
-
-describe('TableControlBar', () => {
-  const mockSetAllFilters = jest.fn();
-  const mockSetFilter = jest.fn();
-
-  const defaultContextValue = {
-    columns: [] as any[],
-    setAllFilters: mockSetAllFilters,
-    state: {
-      filters: [] as any[],
-    },
-  };
-
-  const renderWithContext = (contextValue = defaultContextValue) => (
-    renderWrapper(
-      <DataTableContext.Provider value={contextValue}>
-        <TableControlBar />
-      </DataTableContext.Provider>,
-    )
-  );
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should render basic structure with SortDropdown and RowStatus', () => {
-    renderWithContext();
-
-    expect(screen.getByRole('group', { name: 'Sort options' })).toBeInTheDocument();
-    const container = screen.getByText('Sort Dropdown').closest('.pgn__data-table-status-bar');
-    expect(container).toHaveClass('pgn__data-table-status-bar', 'mb-3', 'flex-wrap');
-  });
-
-  it('should not render Clear filters button when no filters are active', () => {
-    renderWithContext();
-
-    expect(screen.queryByText('Clear filters')).not.toBeInTheDocument();
-  });
-
-  it('should render Clear filters button when filters are active', () => {
-    const contextWithFilters = {
-      ...defaultContextValue,
-      state: {
-        filters: [{ id: 'username', value: 'test' }],
-      },
-    };
-
-    renderWithContext(contextWithFilters);
-
-    expect(screen.getByText('Clear filters')).toBeInTheDocument();
-  });
-
-  it('should call setAllFilters with empty array when Clear filters is clicked', async () => {
-    const user = userEvent.setup();
-    const contextWithFilters = {
-      ...defaultContextValue,
-      state: {
-        filters: [{ id: 'username', value: 'test' }],
-      },
-    };
-
-    renderWithContext(contextWithFilters);
-
-    const clearButton = screen.getByText('Clear filters');
-    await user.click(clearButton);
-
-    expect(mockSetAllFilters).toHaveBeenCalledWith([]);
-  });
-
-  it('should render MultipleChoiceFilter for columns with CheckboxFilter', () => {
-    const contextWithCheckboxColumn = {
-      ...defaultContextValue,
-      columns: [
-        {
-          id: 'roles',
-          Header: 'Roles',
-          Filter: CheckboxFilter,
-          canFilter: true,
-          accessor: 'roles',
-        },
-      ],
-    };
-
-    renderWithContext(contextWithCheckboxColumn);
-
-    const multipleChoiceFilter = screen.getByRole('group', { name: 'Filter by roles' });
-    expect(multipleChoiceFilter).toBeInTheDocument();
-    expect(screen.getByText('Multiple Choice Filter')).toBeInTheDocument();
-  });
-
-  it('should render SearchFilter for columns with TextFilter', () => {
-    const contextWithTextColumn = {
-      ...defaultContextValue,
-      columns: [
-        {
-          id: 'username',
-          Header: 'Username',
-          Filter: TextFilter,
-          canFilter: true,
-          filterValue: '',
-          setFilter: mockSetFilter,
-          accessor: 'username',
-        },
-      ],
-    };
-
-    renderWithContext(contextWithTextColumn);
-
-    expect(screen.getByRole('search', { name: 'Search filter' })).toBeInTheDocument();
-    expect(screen.getByRole('textbox', { name: 'Search input' })).toBeInTheDocument();
-  });
-
-  it('should not render any filter for unsupported Filter types', () => {
-    const CustomFilter = () => <div>Custom Filter</div>;
-
-    const contextWithCustomFilter = {
-      ...defaultContextValue,
-      columns: [
-        {
-          id: 'custom',
-          Header: 'Custom',
-          Filter: CustomFilter,
-          canFilter: true,
-        },
-      ],
-    };
-
-    renderWithContext(contextWithCustomFilter);
-
-    // Only SortDropdown should be present, no filter components
-    expect(screen.getByRole('group', { name: 'Sort options' })).toBeInTheDocument();
-    expect(screen.queryByRole('search', { name: 'Search filter' })).not.toBeInTheDocument();
-    expect(screen.queryByRole('group', { name: /Filter by/ })).not.toBeInTheDocument();
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/TeamTable/components/TableControlBar.tsx b/src/authz-module/libraries-manager/components/TeamTable/components/TableControlBar.tsx
deleted file mode 100644
index 0d02a5f6..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/components/TableControlBar.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useContext } from 'react';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  DataTable, DataTableContext,
-  CheckboxFilter,
-  Stack,
-  TextFilter,
-  Button,
-} from '@openedx/paragon';
-
-import MultipleChoiceFilter from './MultipleChoiceFilter';
-import SortDropdown from './SortDropdown';
-import SearchFilter from './SearchFilter';
-import messages from '../messages';
-
-const TableControlBar = () => {
-  const intl = useIntl();
-  const {
-    columns,
-    setAllFilters,
-    state,
-  } = useContext<DataTableContext>(DataTableContext);
-
-  const availableFilters = columns.filter((column) => column.canFilter);
-
-  const columnTextFilterHeaders = columns
-    .filter((column) => column.Filter === TextFilter)
-    .map((column) => column.Header);
-
-  const getSearchPlaceholder = () => intl.formatMessage(messages['authz.libraries.team.table.search'], {
-    firstField: columnTextFilterHeaders[0] || 'field',
-    secondField: columnTextFilterHeaders[1] || 'field',
-  });
-
-  return (
-    <Stack className="pgn__data-table-status-bar mb-3 flex-wrap" gap={2} direction="horizontal">
-
-      {availableFilters.map((column) => {
-        if (column.Filter === CheckboxFilter) {
-          return <MultipleChoiceFilter {...column} />;
-        }
-
-        if (column.Filter === TextFilter) {
-          return (
-            <SearchFilter
-              key={column.id || column.accessor}
-              filterValue={column.filterValue}
-              setFilter={column.setFilter}
-              placeholder={getSearchPlaceholder()}
-            />
-          );
-        }
-
-        return null;
-      })}
-
-      <SortDropdown />
-
-      {state.filters.length > 0 && (
-      <Button
-        variant="link"
-        onClick={() => setAllFilters([])}
-      >
-        {intl.formatMessage(messages['authz.libraries.team.table.clearFilters'])}
-      </Button>
-      )}
-
-      <DataTable.RowStatus className="ml-auto" />
-    </Stack>
-  );
-};
-
-export default TableControlBar;
diff --git a/src/authz-module/libraries-manager/components/TeamTable/index.test.tsx b/src/authz-module/libraries-manager/components/TeamTable/index.test.tsx
deleted file mode 100644
index 247ede1c..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/index.test.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { renderWrapper } from '@src/setupTest';
-import { useTeamMembers } from '@src/authz-module/data/hooks';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { ToastManagerProvider } from '@src/components/ToastManager/ToastManagerContext';
-import { CONTENT_LIBRARY_PERMISSIONS } from '@src/authz-module/constants';
-import TeamTable from './index';
-
-const mockNavigate = jest.fn();
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockNavigate,
-}));
-
-jest.mock('@src/authz-module/data/hooks', () => ({
-  useTeamMembers: jest.fn(),
-}));
-
-jest.mock('@src/authz-module/libraries-manager/context', () => ({
-  useLibraryAuthZ: jest.fn(),
-}));
-
-describe('TeamTable', () => {
-  const mockTeamMembers = {
-    count: 2,
-    results: [
-      {
-        email: 'alice@example.com',
-        roles: ['admin', 'editor'],
-        username: 'alice',
-      },
-      {
-        email: 'bob@example.com',
-        roles: ['viewer'],
-        username: 'bob',
-      },
-    ],
-  };
-
-  const mockAuthZ = {
-    libraryId: 'lib:123',
-    canManageTeam: true,
-    username: 'alice',
-    roles: [
-      {
-        role: 'admin',
-        permissions: [
-          CONTENT_LIBRARY_PERMISSIONS.DELETE_LIBRARY,
-          CONTENT_LIBRARY_PERMISSIONS.PUBLISH_LIBRARY_CONTENT,
-          CONTENT_LIBRARY_PERMISSIONS.MANAGE_LIBRARY_TEAM,
-        ],
-        userCount: 3,
-        name: 'Admin',
-        description: 'The Admin role',
-      },
-      {
-        role: 'editor',
-        permissions: [
-          CONTENT_LIBRARY_PERMISSIONS.EDIT_LIBRARY_CONTENT,
-          CONTENT_LIBRARY_PERMISSIONS.PUBLISH_LIBRARY_CONTENT,
-        ],
-        userCount: 3,
-        name: 'Editor',
-        description: 'The Editor role',
-      },
-      {
-        role: 'viewer',
-        permissions: [
-          CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY,
-        ],
-        userCount: 3,
-        name: 'Viewer',
-        description: 'The Viewer role',
-      },
-    ],
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('shows skeletons while loading', () => {
-    (useTeamMembers as jest.Mock).mockReturnValue({
-      data: null,
-      isLoading: true,
-    });
-    (useLibraryAuthZ as jest.Mock).mockReturnValue(mockAuthZ);
-
-    renderWrapper(<ToastManagerProvider><TeamTable /></ToastManagerProvider>);
-
-    const skeletons = screen.getAllByText('', { selector: '[aria-busy="true"]' });
-    expect(skeletons.length).toBeGreaterThan(0);
-  });
-
-  it('renders team member data after loading', () => {
-    (useTeamMembers as jest.Mock).mockReturnValue({
-      data: mockTeamMembers,
-      isLoading: false,
-    });
-    (useLibraryAuthZ as jest.Mock).mockReturnValue(mockAuthZ);
-
-    renderWrapper(<ToastManagerProvider><TeamTable /></ToastManagerProvider>);
-
-    expect(screen.getByText('alice')).toBeInTheDocument();
-    expect(screen.getByText('alice@example.com')).toBeInTheDocument();
-    expect(screen.getByText('Admin')).toBeInTheDocument();
-    expect(screen.getByText('Editor')).toBeInTheDocument();
-
-    expect(screen.getByText('bob')).toBeInTheDocument();
-    expect(screen.getByText('bob@example.com')).toBeInTheDocument();
-    expect(screen.getByText('Viewer')).toBeInTheDocument();
-  });
-
-  it('renders Edit button only for users with than can manage team members (current user can not edit themselves)', async () => {
-    (useTeamMembers as jest.Mock).mockReturnValue({
-      data: mockTeamMembers,
-      isLoading: false,
-    });
-    (useLibraryAuthZ as jest.Mock).mockReturnValue(mockAuthZ);
-
-    renderWrapper(<ToastManagerProvider><TeamTable /></ToastManagerProvider>);
-
-    const editButtons = screen.queryAllByText('Edit');
-    // Should not find Edit button for current user
-    expect(editButtons).toHaveLength(1);
-
-    await userEvent.click(editButtons[0]);
-    expect(mockNavigate).toHaveBeenCalledWith(
-      `/authz/libraries/${mockAuthZ.libraryId}/bob`,
-    );
-  });
-
-  it('does not render Edit button if canManageTeam is false', () => {
-    (useTeamMembers as jest.Mock).mockReturnValue({
-      data: mockTeamMembers,
-      isLoading: false,
-    });
-    (useLibraryAuthZ as jest.Mock).mockReturnValue({
-      ...mockAuthZ,
-      canManageTeam: false,
-    });
-
-    renderWrapper(<ToastManagerProvider><TeamTable /></ToastManagerProvider>);
-
-    expect(screen.queryByText('Edit')).not.toBeInTheDocument();
-  });
-
-  it('does not render Edit button while loading', () => {
-    (useTeamMembers as jest.Mock).mockReturnValue({
-      data: null,
-      isLoading: true,
-    });
-    (useLibraryAuthZ as jest.Mock).mockReturnValue(mockAuthZ);
-
-    renderWrapper(<ToastManagerProvider><TeamTable /></ToastManagerProvider>);
-
-    expect(screen.queryByText('Edit')).not.toBeInTheDocument();
-  });
-});
diff --git a/src/authz-module/libraries-manager/components/TeamTable/index.tsx b/src/authz-module/libraries-manager/components/TeamTable/index.tsx
deleted file mode 100644
index 99f38bc3..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/index.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import debounce from 'lodash.debounce';
-import { useIntl } from '@edx/frontend-platform/i18n';
-import {
-  DataTable,
-  TextFilter,
-  CheckboxFilter,
-  TableFooter,
-} from '@openedx/paragon';
-
-import { useTeamMembers } from '@src/authz-module/data/hooks';
-import { useLibraryAuthZ } from '@src/authz-module/libraries-manager/context';
-import { SKELETON_ROWS, TABLE_DEFAULT_PAGE_SIZE } from '@src/authz-module/constants';
-import { useToastManager } from '@src/components/ToastManager/ToastManagerContext';
-import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
-import TableControlBar from './components/TableControlBar';
-import messages from './messages';
-import {
-  ActionCell, EmailCell, NameCell, RolesCell,
-} from './components/Cells';
-
-const TeamTable = () => {
-  const intl = useIntl();
-  const {
-    libraryId, roles,
-  } = useLibraryAuthZ();
-  const { showErrorToast } = useToastManager();
-
-  const { querySettings, handleTableFetch } = useQuerySettings();
-
-  const {
-    data: teamMembers, isError, error, refetch,
-  } = useTeamMembers(libraryId, querySettings);
-
-  if (error) {
-    showErrorToast(error, refetch);
-  }
-
-  const rows = isError ? [] : (teamMembers?.results || SKELETON_ROWS);
-  const pageCount = teamMembers?.count ? Math.ceil(teamMembers.count / TABLE_DEFAULT_PAGE_SIZE) : 1;
-
-  const adaptedFilterChoices = useMemo(
-    () => roles.map((role) => ({
-      name: role.name,
-      number: role.userCount,
-      value: role.role,
-    })),
-    [roles],
-  );
-
-  const fetchData = useMemo(() => debounce(handleTableFetch, 500), [handleTableFetch]);
-
-  useEffect(() => () => fetchData.cancel(), [fetchData]);
-
-  return (
-    <DataTable
-      isFilterable
-      isPaginated
-      isSortable
-      manualFilters
-      manualPagination
-      manualSortBy
-      defaultColumnValues={{ Filter: TextFilter }}
-      numBreakoutFilters={3}
-      fetchData={fetchData}
-      data={rows}
-      itemCount={teamMembers?.count || 0}
-      pageCount={pageCount}
-      initialState={{ pageSize: TABLE_DEFAULT_PAGE_SIZE }}
-      additionalColumns={[
-        {
-          id: 'action',
-          Header: intl.formatMessage(messages['library.authz.team.table.action']),
-          Cell: ActionCell,
-        },
-      ]}
-      columns={
-        [
-          {
-            Header: intl.formatMessage(messages['library.authz.team.table.username']),
-            accessor: 'username',
-            Cell: NameCell,
-            disableSortBy: true,
-          },
-          {
-            Header: intl.formatMessage(messages['library.authz.team.table.email']),
-            accessor: 'email',
-            Cell: EmailCell,
-            disableFilters: true,
-            disableSortBy: true,
-          },
-          {
-            Header: intl.formatMessage(messages['library.authz.team.table.roles']),
-            accessor: 'roles',
-            Cell: RolesCell,
-            Filter: CheckboxFilter,
-            filter: 'includesValue',
-            filterChoices: Object.values(adaptedFilterChoices),
-            disableSortBy: true,
-          },
-        ]
-      }
-    >
-      <TableControlBar />
-      <DataTable.Table />
-      <TableFooter />
-    </DataTable>
-  );
-};
-
-export default TeamTable;
diff --git a/src/authz-module/libraries-manager/components/TeamTable/messages.ts b/src/authz-module/libraries-manager/components/TeamTable/messages.ts
deleted file mode 100644
index 1bc30a2a..00000000
--- a/src/authz-module/libraries-manager/components/TeamTable/messages.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'library.authz.team.table.username': {
-    id: 'library.authz.team.table.username',
-    defaultMessage: 'Username',
-    description: 'Libraries team management table username column header',
-  },
-  'library.authz.team.table.username.current': {
-    id: 'library.authz.team.table.username.current',
-    defaultMessage: ' (Me)',
-    description: 'Libraries team management table indicative of current user',
-  },
-  'library.authz.team.table.email': {
-    id: 'library.team.table.email',
-    defaultMessage: 'Email',
-    description: 'Libraries team management table email column header',
-  },
-  'library.authz.team.table.roles': {
-    id: 'library.authz.team.table.roles',
-    defaultMessage: 'Roles',
-    description: 'Libraries team management table roles column header',
-  },
-  'library.authz.team.table.action': {
-    id: 'library.authz.team.table.action',
-    defaultMessage: 'Action',
-    description: 'Libraries team management table action column header',
-  },
-  'authz.libraries.team.table.edit.action': {
-    id: 'authz.libraries.team.table.edit.action',
-    defaultMessage: 'Edit',
-    description: 'Edit action',
-  },
-  'authz.libraries.team.table.search': {
-    id: 'authz.libraries.team.table.search',
-    defaultMessage: 'Search by {firstField} or {secondField}',
-    description: 'Search placeholder for two specific fields',
-  },
-  'authz.libraries.team.table.sort.name-a-z': {
-    id: 'authz.libraries.team.table.sort.name-a-z',
-    defaultMessage: 'Name A-Z',
-    description: 'Sort by name A-Z',
-  },
-  'authz.libraries.team.table.sort.name-z-a': {
-    id: 'authz.libraries.team.table.sort.name-z-a',
-    defaultMessage: 'Name Z-A',
-    description: 'Sort by name Z-A',
-  },
-  'authz.libraries.team.table.clearFilters': {
-    id: 'authz.libraries.team.table.clearFilters',
-    defaultMessage: 'Clear filters',
-    description: 'Button to clear all active filters in the table',
-  },
-});
-
-export default messages;
diff --git a/src/authz-module/libraries-manager/components/messages.ts b/src/authz-module/libraries-manager/components/messages.ts
deleted file mode 100644
index 2fe2dca8..00000000
--- a/src/authz-module/libraries-manager/components/messages.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'libraries.authz.manage.assign.new.role.title': {
-    id: 'libraries.authz.manage.assign.new.role.title',
-    defaultMessage: 'Add New Role',
-    description: 'Libraries AuthZ assign a new role to a user button title',
-  },
-  'libraries.authz.manage.cancel.button': {
-    id: 'libraries.authz.manage.cancel.button',
-    defaultMessage: 'Cancel',
-    description: 'Libraries AuthZ cancel button title',
-  },
-  'libraries.authz.manage.saving.button': {
-    id: 'libraries.authz.manage.saving.button',
-    defaultMessage: 'Saving...',
-    description: 'Libraries AuthZ saving button title',
-  },
-  'libraries.authz.manage.save.button': {
-    id: 'libraries.authz.manage.save.button',
-    defaultMessage: 'Save',
-    description: 'Libraries AuthZ save button title',
-  },
-  'libraries.authz.manage.assign.role.success': {
-    id: 'libraries.authz.manage.assign.role.success',
-    defaultMessage: 'Role added successfully.',
-    description: 'Libraries AuthZ assign role success message',
-  },
-  'libraries.authz.manage.assign.role.existing': {
-    id: 'libraries.authz.manage.assign.existing',
-    defaultMessage: 'The user already has the role.',
-    description: 'Libraries AuthZ assign existing role',
-  },
-  'library.authz.team.remove.user.modal.title': {
-    id: 'library.authz.team.remove.user.modal.title',
-    defaultMessage: 'Remove role?',
-    description: 'Libraries team management remove user modal title',
-  },
-  'library.authz.team.remove.user.modal.body.1': {
-    id: 'library.authz.team.remove.user.modal.body',
-    defaultMessage: 'Are you sure you want to remove the {role} role from the user “{userName}” in the library {scope}?',
-    description: 'Libraries team management remove user modal body',
-  },
-  'library.authz.team.remove.user.modal.body.2': {
-    id: 'library.authz.team.remove.user.modal.body',
-    defaultMessage: "This is the user's only role in this library. Removing it will revoke their access completely, and they will no longer appear in the library's member List.",
-    description: 'Libraries team management remove user modal body',
-  },
-  'library.authz.team.remove.user.modal.body.3': {
-    id: 'library.authz.team.remove.user.modal.body',
-    defaultMessage: 'Are you sure you want to proceed?',
-    description: 'Libraries team management remove user modal body',
-  },
-  'library.authz.manage.role.select.label': {
-    id: 'library.authz.role.select.label',
-    defaultMessage: 'Roles',
-    description: 'Libraries team management label for roles select',
-  },
-  'libraries.authz.manage.removing.button': {
-    id: 'libraries.authz.manage.removing.button',
-    defaultMessage: 'Removing...',
-    description: 'Libraries AuthZ removing button title',
-  },
-  'libraries.authz.manage.remove.button': {
-    id: 'libraries.authz.manage.remove.button',
-    defaultMessage: 'Remove',
-    description: 'Libraries AuthZ remove button title',
-  },
-});
-
-export default messages;
diff --git a/src/authz-module/libraries-manager/context.test.tsx b/src/authz-module/libraries-manager/context.test.tsx
deleted file mode 100644
index d004b906..00000000
--- a/src/authz-module/libraries-manager/context.test.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Component, ReactNode } from 'react';
-import { screen, renderHook } from '@testing-library/react';
-import { useParams } from 'react-router-dom';
-import { useValidateUserPermissions } from '@src/data/hooks';
-import { renderWrapper } from '@src/setupTest';
-import { usePermissionsByRole } from '@src/authz-module/data/hooks';
-import { CustomErrors } from '@src/constants';
-import { CONTENT_LIBRARY_PERMISSIONS } from '../constants';
-import { LibraryAuthZProvider, useLibraryAuthZ } from './context';
-
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useParams: jest.fn(),
-}));
-
-jest.mock('@src/data/hooks', () => ({
-  useValidateUserPermissions: jest.fn(),
-}));
-
-// Move the mock after imports and use actual values
-jest.mock('@src/authz-module/data/hooks', () => ({
-  usePermissionsByRole: jest.fn(),
-}));
-
-class ErrorBoundary extends Component<{ children: ReactNode }, { hasError: boolean; error?: Error }> {
-  constructor(props: { children: ReactNode }) {
-    super(props);
-    this.state = { hasError: false };
-  }
-
-  static getDerivedStateFromError(error: Error) {
-    return { hasError: true, error };
-  }
-
-  render() {
-    if (this.state.hasError && this.state.error) {
-      throw this.state.error;
-    }
-    return this.props.children;
-  }
-}
-
-const TestComponent = () => {
-  const context = useLibraryAuthZ();
-  return (
-    <div>
-      <div>Username: {context.username}</div>
-      <div>Library ID: {context.libraryId}</div>
-      <div>Can manage team: {context.canManageTeam ? 'Yes' : 'No'}</div>
-      <div>Roles count: {Array.isArray(context.roles) ? context.roles.length : 'undefined'}</div>
-      <div>Permissions count: {Array.isArray(context.permissions) ? context.permissions.length : 'undefined'}</div>
-      <div>Resources count: {Array.isArray(context.resources) ? context.resources.length : 'undefined'}</div>
-    </div>
-  );
-};
-
-describe('LibraryAuthZProvider', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    (useParams as jest.Mock).mockReturnValue({ libraryId: 'lib123' });
-    (usePermissionsByRole as jest.Mock).mockReturnValue({
-      data: [
-        {
-          role: 'library_author',
-          permissions: [
-            CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY_TEAM,
-            CONTENT_LIBRARY_PERMISSIONS.EDIT_LIBRARY_CONTENT,
-          ],
-          user_count: 12,
-        },
-        {
-          role: 'instructor',
-          description: 'Can create and edit content',
-          userCount: 3,
-          objects: [
-            {
-              object: 'library',
-              description: 'Library permissions',
-              actions: ['view', 'edit', 'delete'],
-            },
-          ],
-        },
-        {
-          role: 'admin',
-          description: 'Full access to the library',
-          userCount: 1,
-          objects: [
-            {
-              object: 'library',
-              description: 'Library permissions',
-              actions: ['view', 'edit', 'delete', 'manage'],
-            },
-          ],
-        },
-      ],
-    });
-  });
-
-  it('provides the correct context values to consumers', () => {
-    (useValidateUserPermissions as jest.Mock).mockReturnValue({
-      data: [
-        { allowed: true }, // canViewTeam
-        { allowed: true }, // canManageTeam
-      ],
-    });
-
-    renderWrapper(
-      <LibraryAuthZProvider>
-        <TestComponent />
-      </LibraryAuthZProvider>,
-    );
-
-    expect(screen.getByText(/Username: testuser/)).toBeInTheDocument();
-    expect(screen.getByText(/Library ID: lib123/)).toBeInTheDocument();
-    expect(screen.getByText(/Can manage team: Yes/)).toBeInTheDocument();
-    expect(screen.getByText(/Roles count: \d+/)).toBeInTheDocument();
-    expect(screen.getByText(/Permissions count: \d+/)).toBeInTheDocument();
-    expect(screen.getByText(/Resources count: \d+/)).toBeInTheDocument();
-  });
-
-  it('throws error when user lacks both view and manage permissions', () => {
-    (useValidateUserPermissions as jest.Mock).mockReturnValue({
-      data: [
-        { allowed: false }, // canViewTeam
-        { allowed: false }, // canManageTeam
-      ],
-    });
-
-    expect(() => {
-      renderWrapper(
-        <LibraryAuthZProvider>
-          <TestComponent />
-        </LibraryAuthZProvider>,
-      );
-    }).toThrow(CustomErrors.NO_ACCESS);
-  });
-
-  it('provides context when user can view but not manage team', () => {
-    (useValidateUserPermissions as jest.Mock).mockReturnValue({
-      data: [
-        { allowed: true }, // canViewTeam
-        { allowed: false }, // canManageTeam
-      ],
-    });
-
-    renderWrapper(
-      <LibraryAuthZProvider>
-        <TestComponent />
-      </LibraryAuthZProvider>,
-    );
-
-    expect(screen.getByText(/Can manage team: No/)).toBeInTheDocument();
-  });
-
-  it('throws error when libraryId is missing', () => {
-    (useParams as jest.Mock).mockReturnValue({}); // No libraryId
-
-    expect(() => {
-      renderWrapper(
-        <ErrorBoundary>
-          <LibraryAuthZProvider>
-            <TestComponent />
-          </LibraryAuthZProvider>
-        </ErrorBoundary>,
-      );
-    }).toThrow(CustomErrors.NOT_FOUND);
-  });
-
-  it('throws error when useLibraryAuthZ is used outside provider', () => {
-    expect(() => {
-      renderHook(() => useLibraryAuthZ());
-    }).toThrow('useLibraryAuthZ must be used within an LibraryAuthZProvider');
-  });
-});
diff --git a/src/authz-module/libraries-manager/context.tsx b/src/authz-module/libraries-manager/context.tsx
deleted file mode 100644
index 9f9b972f..00000000
--- a/src/authz-module/libraries-manager/context.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import {
-  createContext, useContext, useMemo, ReactNode,
-} from 'react';
-import { useParams } from 'react-router-dom';
-import { AppContext } from '@edx/frontend-platform/react';
-import { useValidateUserPermissions } from '@src/data/hooks';
-import { usePermissionsByRole } from '@src/authz-module/data/hooks';
-import { PermissionMetadata, ResourceMetadata, Role } from 'types';
-import { CustomErrors } from '@src/constants';
-import {
-  CONTENT_LIBRARY_PERMISSIONS, libraryPermissions, libraryResourceTypes,
-} from '../constants';
-import { libraryRolesMetadata } from '../roles-permissions/library/constants';
-
-const LIBRARY_TEAM_PERMISSIONS = [
-  CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY_TEAM,
-  CONTENT_LIBRARY_PERMISSIONS.MANAGE_LIBRARY_TEAM,
-];
-
-export type AppContextType = {
-  authenticatedUser: {
-    username: string;
-    email: string;
-  };
-};
-
-type LibraryAuthZContextType = {
-  canManageTeam: boolean;
-  username: string;
-  libraryId: string;
-  resources: ResourceMetadata[];
-  roles: Role[];
-  permissions: PermissionMetadata[];
-};
-
-const LibraryAuthZContext = createContext<LibraryAuthZContextType | undefined>(undefined);
-
-type AuthZProviderProps = {
-  children: ReactNode;
-};
-
-export const LibraryAuthZProvider = ({ children }: AuthZProviderProps) => {
-  const { libraryId } = useParams<{ libraryId: string }>();
-  const { authenticatedUser } = useContext(AppContext) as AppContextType;
-
-  // TODO: Implement a custom error view
-  if (!libraryId) {
-    throw new Error(CustomErrors.NOT_FOUND);
-  }
-  const permissions = LIBRARY_TEAM_PERMISSIONS.map(action => ({ action, scope: libraryId }));
-
-  const { data: userPermissions } = useValidateUserPermissions(permissions);
-  const [{ allowed: canViewTeam }, { allowed: canManageTeam }] = userPermissions;
-
-  if (!canViewTeam && !canManageTeam) {
-    throw new Error(CustomErrors.NO_ACCESS);
-  }
-
-  const { data: libraryRoles } = usePermissionsByRole(libraryId);
-  const roles = libraryRoles.map(role => ({
-    ...role,
-    ...libraryRolesMetadata.find(r => r.role === role.role),
-  } as Role));
-
-  const value = useMemo((): LibraryAuthZContextType => ({
-    username: authenticatedUser.username,
-    libraryId,
-    roles,
-    permissions: libraryPermissions,
-    resources: libraryResourceTypes,
-    canManageTeam,
-  }), [libraryId, authenticatedUser.username, canManageTeam, roles]);
-
-  return (
-    <LibraryAuthZContext.Provider value={value}>
-      {children}
-    </LibraryAuthZContext.Provider>
-  );
-};
-
-export const useLibraryAuthZ = (): LibraryAuthZContextType => {
-  const context = useContext(LibraryAuthZContext);
-  if (context === undefined) {
-    throw new Error('useLibraryAuthZ must be used within an LibraryAuthZProvider');
-  }
-  return context;
-};
diff --git a/src/authz-module/libraries-manager/index.tsx b/src/authz-module/libraries-manager/index.tsx
deleted file mode 100644
index ed1fc1e9..00000000
--- a/src/authz-module/libraries-manager/index.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Outlet } from 'react-router-dom';
-import LibrariesTeamManager from './LibrariesTeamManager';
-import LibrariesUserManager from './LibrariesUserManager';
-import { LibraryAuthZProvider } from './context';
-
-const LibrariesLayout = () => (<LibraryAuthZProvider><Outlet /></LibraryAuthZProvider>);
-
-export {
-  LibrariesLayout,
-  LibrariesTeamManager,
-  LibrariesUserManager,
-};
diff --git a/src/authz-module/libraries-manager/messages.ts b/src/authz-module/libraries-manager/messages.ts
deleted file mode 100644
index 10aba4f6..00000000
--- a/src/authz-module/libraries-manager/messages.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { defineMessages } from '@edx/frontend-platform/i18n';
-
-const messages = defineMessages({
-  'library.authz.manage.page.title': {
-    id: 'library.authz.manage.page.title',
-    defaultMessage: 'Library Team Management',
-    description: 'Libraries AuthZ page title',
-  },
-  'library.authz.breadcrumb.root': {
-    id: 'library.authz.breadcrumb.root',
-    defaultMessage: 'Manage Access',
-    description: 'Libraries AuthZ root breadcrumb',
-  },
-  'library.authz.tabs.team': {
-    id: 'library.authz.tabs.team',
-    defaultMessage: 'Team Members',
-    description: 'Libraries AuthZ title for the team management tab',
-  },
-  'library.authz.tabs.roles': {
-    id: 'library.authz.tabs.roles',
-    defaultMessage: 'Roles',
-    description: 'Libraries AuthZ title for the roles tab',
-  },
-  'library.authz.tabs.permissions': {
-    id: 'library.authz.tabs.permissions',
-    defaultMessage: 'Permissions',
-    description: 'Libraries AuthZ title for the permissions tab',
-  },
-  'library.authz.tabs.permissionsRoles': {
-    id: 'library.authz.tabs.permissionsRoles',
-    defaultMessage: 'Roles and Permissions',
-    description: 'Libraries AuthZ title for the permissions and roles tab',
-  },
-  'library.authz.tabs.permissionsRoles.courses.alert.title': {
-    id: 'library.authz.tabs.permissionsRoles.courses.alert.title',
-    defaultMessage: 'Course Roles',
-    description: 'Libraries AuthZ title for the course roles alert',
-  },
-  'library.authz.tabs.permissionsRoles.courses.tab': {
-    id: 'library.authz.tabs.permissionsRoles.courses.tab',
-    defaultMessage: 'Courses',
-    description: 'Libraries AuthZ title for the course roles tab',
-  },
-  'library.authz.tabs.permissionsRoles.libraries.tab': {
-    id: 'library.authz.tabs.permissionsRoles.libraries.tab',
-    defaultMessage: 'Libraries',
-    description: 'Libraries AuthZ title for the libraries roles tab',
-  },
-  'library.authz.tabs.permissionsRoles.libraries.tab.title': {
-    id: 'library.authz.tabs.permissionsRoles.libraries.tab.title',
-    defaultMessage: 'Library Roles',
-    description: 'Libraries AuthZ title for the library roles table',
-  },
-  'library.authz.tabs.permissionsRoles.courses.tab.title': {
-    id: 'library.authz.tabs.permissionsRoles.courses.tab.title',
-    defaultMessage: 'Course Roles',
-    description: 'Libraries AuthZ title for the course roles table',
-  },
-  'library.authz.tabs.permissionsRoles.courses.alert.note': {
-    id: 'library.authz.tabs.permissionsRoles.courses.alert.note',
-    defaultMessage: 'Note:',
-    description: 'Libraries AuthZ note for the course roles alert',
-  },
-  'library.authz.tabs.permissionsRoles.courses.alert.description': {
-    id: 'library.authz.tabs.permissionsRoles.courses.alert.description',
-    defaultMessage: 'This list shows the permissions currently available in Authoring Studio. Some roles may grant additional permissions manages outside this interface.',
-    description: 'Libraries AuthZ description for the course roles alert',
-  },
-  'library.authz.tabs.permissionsRoles.courses.alert.link': {
-    id: 'library.authz.tabs.permissionsRoles.courses.alert.link',
-    defaultMessage: 'See full documentation',
-    description: 'Libraries AuthZ link for the course roles alert',
-  },
-  'library.authz.team.remove.user.toast.success.description': {
-    id: 'library.authz.team.remove.user.toast.success.description',
-    defaultMessage: 'The {role} role has been successfully removed.{rolesCount, plural, =0 { The user no longer has access to this library and has been removed from the member list.} other {}}',
-    description: 'Libraries team management remove user toast success',
-  },
-  'library.authz.team.toast.default.error.message': {
-    id: 'library.authz.team.toast.default.error.message',
-    defaultMessage: '<Bold>Something went wrong on our end.</Bold> <Br></Br>Please try again later.',
-    description: 'Libraries default error message',
-  },
-});
-
-export default messages;
diff --git a/src/authz-module/libraries-manager/utils.test.ts b/src/authz-module/libraries-manager/utils.test.ts
deleted file mode 100644
index 71804dd6..00000000
--- a/src/authz-module/libraries-manager/utils.test.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { buildPermissionMatrixByResource, buildPermissionMatrixByRole } from './utils';
-
-const intl = { formatMessage: jest.fn((msg: any) => msg) };
-
-const permissions = [
-  {
-    key: 'create_library', resource: 'library', label: 'Create Library', description: '',
-  },
-  {
-    key: 'edit_library', resource: 'library', label: 'Edit Library', description: '',
-  },
-];
-const resources = [
-  { key: 'library', label: 'Library', description: '' },
-];
-const roles = [
-  {
-    name: 'admin', permissions: ['create_library', 'edit_library'], userCount: 2, role: 'admin', description: '', contextType: '',
-  },
-  {
-    name: 'editor', permissions: ['edit_library'], userCount: 2, role: 'editor', description: '', contextType: '',
-  },
-  {
-    name: 'guest', permissions: [], userCount: 2, role: 'guest', description: '', contextType: '',
-  },
-];
-
-describe('buildPermissionsMatrix', () => {
-  it('returns permissions a matrix of given roles', () => {
-    const matrix = buildPermissionMatrixByRole({
-      roles, permissions, resources, intl,
-    });
-    expect(matrix.length).toBe(3);
-    expect(matrix[1]).toEqual({
-      name: 'editor',
-      userCount: 2,
-      role: 'editor',
-      description: '',
-      contextType: '',
-      permissions: ['edit_library'],
-      resources: [
-        {
-          key: 'library',
-          label: 'Library',
-          description: '',
-          permissions: [
-            {
-              actionKey: 'create',
-              description: '',
-              disabled: true,
-              key: 'create_library',
-              label: 'Create Library',
-              resource: 'library',
-            },
-            {
-              key: 'edit_library',
-              resource: 'library',
-              label: 'Edit Library',
-              description: '',
-              actionKey: 'edit',
-              disabled: false,
-            },
-          ],
-        },
-      ],
-    });
-  });
-
-  it('should build permission matrix grouped by resources with role access mapped', () => {
-    const matrix = buildPermissionMatrixByResource({
-      roles, permissions, resources, intl,
-    });
-
-    expect(matrix).toEqual([
-      {
-        key: 'library',
-        label: 'Library',
-        description: '',
-        permissions: [
-          {
-            key: 'create_library',
-            actionKey: 'create',
-            label: 'Create Library',
-            resource: 'library',
-            description: '',
-            roles: {
-              admin: true,
-              editor: false,
-              guest: false,
-            },
-          },
-          {
-            key: 'edit_library',
-            actionKey: 'edit',
-            resource: 'library',
-            label: 'Edit Library',
-            description: '',
-            roles: {
-              admin: true,
-              editor: true,
-              guest: false,
-            },
-          },
-        ],
-      },
-    ]);
-  });
-});
diff --git a/src/authz-module/libraries-manager/utils.ts b/src/authz-module/libraries-manager/utils.ts
deleted file mode 100644
index 17ff64cc..00000000
--- a/src/authz-module/libraries-manager/utils.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { IntlShape } from '@edx/frontend-platform/i18n';
-import { actionKeys } from '@src/authz-module/components/RoleCard/constants';
-import {
-  EnrichedPermission, PermissionMetadata, PermissionsResourceGrouped,
-  PermissionsRoleGrouped, ResourceMetadata, Role, RoleResourceGroup,
-} from '@src/types';
-import actionMessages from '../components/RoleCard/messages';
-
-/**
- * Derives the localized label and action key for a given permission.
- *
- * This function enhance the permissions metadata mapping the key to a list of prefefined actions
- * to add visual elemments (icons) and a localized label.
- * If a label is already defined in the permission metadata, that is returned as-is.
- *
- * Special handling is applied for action keys like `'tag'` and `'team'`, which are
- * normalized to `'manage'` and given a custom resource string for translation.
- *
- * @param permission - The permission metadata, typically containing a key and optional label.
- * @param intl - The `IntlShape` object used to generate localized labels.
- *
- * @returns An object containing:
- * - `label`: The human-readable, localized label for the permission.
- * - `actionKey`: A string representing icon to be displayed (e.g., `'Read'`, `'Edit'`), or '' if not matched.
- */
-const getPermissionMetadata = (permission: PermissionMetadata, intl: IntlShape): EnrichedPermission => {
-  const actionKey = actionKeys.find(action => permission.key.includes(action)) || '';
-  let messageKey = `authz.permissions.actions.${actionKey}`;
-  let messageResource = '';
-
-  if (actionKey === 'tag' || actionKey === 'team') {
-    messageKey = 'authz.permissions.actions.manage';
-    messageResource = actionKey === 'tag' ? 'Tags' : '';
-  }
-
-  const messageDescriptor = actionMessages[messageKey];
-  const label = permission.label || (messageDescriptor
-    ? intl.formatMessage(messageDescriptor, { resource: messageResource })
-    : permission.key);
-
-  return { ...permission, label, actionKey };
-};
-
-type BuildPermissionsMatrixProps = {
-  roles: Role[];
-  permissions: PermissionMetadata[];
-  resources: ResourceMetadata[];
-  intl: IntlShape;
-};
-
-/**
- * Builds a permission matrix from the given roles, permissions, and resources.
- *
- * The matrix groups permissions under their respective resources and maps
- * each permission to which roles have access to it.
- *
- * @param roles - List of roles, each containing a list of granted permission keys.
- * @param permissions - Metadata describing each permission, including its associated resource.
- * @param resources - List of resource metadata used to group permissions.
- * @param intl - The internationalization object used to localize permission labels.
- *
- * @returns A permission matrix grouped by resource, with role mappings per permission.
- */
-const buildPermissionMatrixByResource = ({
-  roles, permissions, resources, intl,
-}: BuildPermissionsMatrixProps): PermissionsResourceGrouped[] => {
-  const enrichedPermissions = permissions.reduce((acc, perm) => {
-    acc[perm.key] = getPermissionMetadata(perm, intl);
-    return acc;
-  }, {} as Record<string, EnrichedPermission>);
-
-  const permissionsByResource = permissions.reduce<Record<string, PermissionMetadata[]>>((acc, perm) => {
-    if (!acc[perm.resource]) { acc[perm.resource] = []; }
-    acc[perm.resource].push(perm);
-    return acc;
-  }, {});
-
-  return resources.map(resource => {
-    const perms = permissionsByResource[resource.key] || [];
-
-    const permissionRows = perms.map(permission => {
-      const enriched = enrichedPermissions[permission.key];
-      const rolesMap = roles.reduce((acc, role) => {
-        acc[role.name] = role.permissions.includes(permission.key);
-        return acc;
-      }, {} as Record<string, boolean>);
-
-      return {
-        ...enriched,
-        roles: rolesMap,
-      };
-    });
-
-    return {
-      ...resource,
-      permissions: permissionRows,
-    };
-  });
-};
-
-/**
- * Builds a permission matrix for grouped by roles.
- *
- * Builds a permission matrix grouped by resource, mapping each action to its display label
- * and enabled/disabled state based on the role's allowed permissions.
- *
- * @param roles - Array of roles metadata.
- * @param permissions - Permissions metadata.
- * @param resources - Resources metadata.
- * @param intl - the i18n function to enable label translations.
- * @returns An array of permission groupings by role and resource with action-level details.
- */
-const buildPermissionMatrixByRole = ({
-  roles, permissions, resources, intl,
-}: BuildPermissionsMatrixProps): PermissionsRoleGrouped[] => {
-  const enrichedPermissions = permissions.reduce((acc, perm) => {
-    acc[perm.key] = getPermissionMetadata(perm, intl);
-    return acc;
-  }, {} as Record<string, EnrichedPermission>);
-
-  return roles.map(role => {
-    const allowed = new Set(role.permissions);
-    const permissionsGroupedByResource: Record<string, RoleResourceGroup> = {};
-
-    permissions.forEach(permission => {
-      const enriched = enrichedPermissions[permission.key];
-      const { resource } = permission;
-
-      if (!enriched.actionKey) { return; }
-
-      if (!permissionsGroupedByResource[resource]) {
-        const resourceInfo = resources.find(r => r.key === resource);
-        if (!resourceInfo) { return; }
-
-        permissionsGroupedByResource[resource] = {
-          key: resourceInfo.key,
-          label: resourceInfo.label,
-          description: resourceInfo.description,
-          permissions: [],
-        };
-      }
-
-      permissionsGroupedByResource[resource].permissions.push({
-        ...enriched,
-        description: permission.description,
-        disabled: !allowed.has(permission.key),
-      });
-    });
-
-    return {
-      ...role,
-      resources: Object.values(permissionsGroupedByResource),
-    };
-  });
-};
-
-export { buildPermissionMatrixByResource, buildPermissionMatrixByRole };