diff --git a/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx b/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx
index a13d08ca..4c82ec64 100644
--- a/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx
+++ b/src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx
@@ -59,7 +59,7 @@ export default function AccessControlsPage() {
 
     const formSchema = z.object({
         username: z.string(),
-        roleId: z.string().min(1, { message: t('accessRoleSelectPlease') }),
+        roleId: z.string().min(1, { message: t("accessRoleSelectPlease") }),
         autoProvisioned: z.boolean()
     });
 
@@ -80,10 +80,10 @@ export default function AccessControlsPage() {
                     console.error(e);
                     toast({
                         variant: "destructive",
-                        title: t('accessRoleErrorFetch'),
+                        title: t("accessRoleErrorFetch"),
                         description: formatAxiosError(
                             e,
-                            t('accessRoleErrorFetchDescription')
+                            t("accessRoleErrorFetchDescription")
                         )
                     });
                 });
@@ -105,7 +105,9 @@ export default function AccessControlsPage() {
         try {
             // Execute both API calls simultaneously
             const [roleRes, userRes] = await Promise.all([
-                api.post<AxiosResponse<InviteUserResponse>>(`/role/${values.roleId}/add/${user.userId}`),
+                api.post<AxiosResponse<InviteUserResponse>>(
+                    `/role/${values.roleId}/add/${user.userId}`
+                ),
                 api.post(`/org/${orgId}/user/${user.userId}`, {
                     autoProvisioned: values.autoProvisioned
                 })
@@ -114,17 +116,17 @@ export default function AccessControlsPage() {
             if (roleRes.status === 200 && userRes.status === 200) {
                 toast({
                     variant: "default",
-                    title: t('userSaved'),
-                    description: t('userSavedDescription')
+                    title: t("userSaved"),
+                    description: t("userSavedDescription")
                 });
             }
         } catch (e) {
             toast({
                 variant: "destructive",
-                title: t('accessRoleErrorAdd'),
+                title: t("accessRoleErrorAdd"),
                 description: formatAxiosError(
                     e,
-                    t('accessRoleErrorAddDescription')
+                    t("accessRoleErrorAddDescription")
                 )
             });
         }
@@ -136,9 +138,11 @@ export default function AccessControlsPage() {
         <SettingsContainer>
             <SettingsSection>
                 <SettingsSectionHeader>
-                    <SettingsSectionTitle>{t('accessControls')}</SettingsSectionTitle>
+                    <SettingsSectionTitle>
+                        {t("accessControls")}
+                    </SettingsSectionTitle>
                     <SettingsSectionDescription>
-                        {t('accessControlsDescription')}
+                        {t("accessControlsDescription")}
                     </SettingsSectionDescription>
                 </SettingsSectionHeader>
 
@@ -151,38 +155,48 @@ export default function AccessControlsPage() {
                                 id="access-controls-form"
                             >
                                 {/* IDP Type Display */}
-                                {user.type !== UserType.Internal && user.idpType && (
-                                    <div className="flex items-center space-x-2 mb-4">
-                                        <span className="text-sm font-medium text-muted-foreground">
-                                            {t("idp")}:
-                                        </span>
-                                        <IdpTypeBadge
-                                            type={user.idpType}
-                                            variant={user.idpVariant || undefined}
-                                            name={user.idpName || undefined}
-                                        />
-                                    </div>
-                                )}
+                                {user.type !== UserType.Internal &&
+                                    user.idpType && (
+                                        <div className="flex items-center space-x-2 mb-4">
+                                            <span className="text-sm font-medium text-muted-foreground">
+                                                {t("idp")}:
+                                            </span>
+                                            <IdpTypeBadge
+                                                type={user.idpType}
+                                                variant={
+                                                    user.idpVariant || undefined
+                                                }
+                                                name={user.idpName || undefined}
+                                            />
+                                        </div>
+                                    )}
 
                                 <FormField
                                     control={form.control}
                                     name="roleId"
                                     render={({ field }) => (
                                         <FormItem>
-                                            <FormLabel>{t('role')}</FormLabel>
+                                            <FormLabel>{t("role")}</FormLabel>
                                             <Select
                                                 onValueChange={(value) => {
                                                     field.onChange(value);
                                                     // If auto provision is enabled, set it to false when role changes
                                                     if (user.idpAutoProvision) {
-                                                        form.setValue("autoProvisioned", false);
+                                                        form.setValue(
+                                                            "autoProvisioned",
+                                                            false
+                                                        );
                                                     }
                                                 }}
                                                 value={field.value}
                                             >
                                                 <FormControl>
                                                     <SelectTrigger>
-                                                        <SelectValue placeholder={t('accessRoleSelect')} />
+                                                        <SelectValue
+                                                            placeholder={t(
+                                                                "accessRoleSelect"
+                                                            )}
+                                                        />
                                                     </SelectTrigger>
                                                 </FormControl>
                                                 <SelectContent>
@@ -202,28 +216,32 @@ export default function AccessControlsPage() {
                                 />
 
                                 {user.idpAutoProvision && (
-                                <FormField
-                                    control={form.control}
-                                    name="autoProvisioned"
-                                    render={({ field }) => (
-                                        <FormItem className="flex flex-row items-start space-x-3 space-y-0">
-                                            <FormControl>
-                                                <Checkbox
-                                                    checked={field.value}
-                                                    onCheckedChange={field.onChange}
-                                                />
-                                            </FormControl>
-                                            <div className="space-y-1 leading-none">
-                                                <FormLabel>
-                                                    {t('autoProvisioned')}
-                                                </FormLabel>
-                                                <p className="text-sm text-muted-foreground">
-                                                    {t('autoProvisionedDescription')}
-                                                </p>
-                                            </div>
-                                        </FormItem>
-                                    )}
-                                />
+                                    <FormField
+                                        control={form.control}
+                                        name="autoProvisioned"
+                                        render={({ field }) => (
+                                            <FormItem className="flex flex-row items-start space-x-2 space-y-0">
+                                                <FormControl>
+                                                    <Checkbox
+                                                        checked={field.value}
+                                                        onCheckedChange={
+                                                            field.onChange
+                                                        }
+                                                    />
+                                                </FormControl>
+                                                <div className="space-y-1 leading-none">
+                                                    <FormLabel>
+                                                        {t("autoProvisioned")}
+                                                    </FormLabel>
+                                                    <p className="text-sm text-muted-foreground">
+                                                        {t(
+                                                            "autoProvisionedDescription"
+                                                        )}
+                                                    </p>
+                                                </div>
+                                            </FormItem>
+                                        )}
+                                    />
                                 )}
                             </form>
                         </Form>
@@ -237,7 +255,7 @@ export default function AccessControlsPage() {
                         disabled={loading}
                         form="access-controls-form"
                     >
-                        {t('accessControlsSubmit')}
+                        {t("accessControlsSubmit")}
                     </Button>
                 </SettingsSectionFooter>
             </SettingsSection>
diff --git a/src/app/[orgId]/settings/share-links/CreateShareLinkForm.tsx b/src/app/[orgId]/settings/share-links/CreateShareLinkForm.tsx
deleted file mode 100644
index e3ba3f17..00000000
--- a/src/app/[orgId]/settings/share-links/CreateShareLinkForm.tsx
+++ /dev/null
@@ -1,549 +0,0 @@
-"use client";
-
-import { Button } from "@app/components/ui/button";
-import {
-    Form,
-    FormControl,
-    FormField,
-    FormItem,
-    FormLabel,
-    FormMessage
-} from "@app/components/ui/form";
-import { Input } from "@app/components/ui/input";
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue
-} from "@app/components/ui/select";
-import { toast } from "@app/hooks/useToast";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { AxiosResponse } from "axios";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-import CopyTextBox from "@app/components/CopyTextBox";
-import {
-    Credenza,
-    CredenzaBody,
-    CredenzaClose,
-    CredenzaContent,
-    CredenzaDescription,
-    CredenzaFooter,
-    CredenzaHeader,
-    CredenzaTitle
-} from "@app/components/Credenza";
-import { useOrgContext } from "@app/hooks/useOrgContext";
-import { formatAxiosError } from "@app/lib/api";
-import { cn } from "@app/lib/cn";
-import { createApiClient } from "@app/lib/api";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { ListResourcesResponse } from "@server/routers/resource";
-import {
-    Popover,
-    PopoverContent,
-    PopoverTrigger
-} from "@app/components/ui/popover";
-import { CaretSortIcon } from "@radix-ui/react-icons";
-import {
-    Command,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList
-} from "@app/components/ui/command";
-import { CheckIcon, ChevronsUpDown } from "lucide-react";
-import { Checkbox } from "@app/components/ui/checkbox";
-import { GenerateAccessTokenResponse } from "@server/routers/accessToken";
-import { constructShareLink } from "@app/lib/shareLinks";
-import { ShareLinkRow } from "@app/components/ShareLinksTable";
-import { QRCodeCanvas, QRCodeSVG } from "qrcode.react";
-import {
-    Collapsible,
-    CollapsibleContent,
-    CollapsibleTrigger
-} from "@app/components/ui/collapsible";
-import AccessTokenSection from "@app/components/AccessTokenUsage";
-import { useTranslations } from "next-intl";
-import { toUnicode } from 'punycode';
-
-type FormProps = {
-    open: boolean;
-    setOpen: (open: boolean) => void;
-    onCreated?: (result: ShareLinkRow) => void;
-};
-
-export default function CreateShareLinkForm({
-    open,
-    setOpen,
-    onCreated
-}: FormProps) {
-    const { org } = useOrgContext();
-
-    const { env } = useEnvContext();
-    const api = createApiClient({ env });
-
-    const [link, setLink] = useState<string | null>(null);
-    const [accessTokenId, setAccessTokenId] = useState<string | null>(null);
-    const [accessToken, setAccessToken] = useState<string | null>(null);
-    const [loading, setLoading] = useState(false);
-    const [neverExpire, setNeverExpire] = useState(false);
-
-    const [isOpen, setIsOpen] = useState(false);
-    const t = useTranslations();
-
-    const [resources, setResources] = useState<
-        {
-            resourceId: number;
-            name: string;
-            resourceUrl: string;
-        }[]
-    >([]);
-
-    const formSchema = z.object({
-        resourceId: z.number({ message: t('shareErrorSelectResource') }),
-        resourceName: z.string(),
-        resourceUrl: z.string(),
-        timeUnit: z.string(),
-        timeValue: z.coerce.number().int().positive().min(1),
-        title: z.string().optional()
-    });
-
-    const timeUnits = [
-        { unit: "minutes", name: t('minutes') },
-        { unit: "hours", name: t('hours') },
-        { unit: "days", name: t('days') },
-        { unit: "weeks", name: t('weeks') },
-        { unit: "months", name: t('months') },
-        { unit: "years", name: t('years') }
-    ];
-
-    const form = useForm<z.infer<typeof formSchema>>({
-        resolver: zodResolver(formSchema),
-        defaultValues: {
-            timeUnit: "days",
-            timeValue: 30,
-            title: ""
-        }
-    });
-
-    useEffect(() => {
-        if (!open) {
-            return;
-        }
-
-        async function fetchResources() {
-            const res = await api
-                .get<
-                    AxiosResponse<ListResourcesResponse>
-                >(`/org/${org?.org.orgId}/resources`)
-                .catch((e) => {
-                    console.error(e);
-                    toast({
-                        variant: "destructive",
-                        title: t('shareErrorFetchResource'),
-                        description: formatAxiosError(
-                            e,
-                            t('shareErrorFetchResourceDescription')
-                        )
-                    });
-                });
-
-            if (res?.status === 200) {
-                setResources(
-                    res.data.data.resources
-                        .filter((r) => {
-                            return r.http;
-                        })
-                        .map((r) => ({
-                            resourceId: r.resourceId,
-                            name: r.name,
-                            resourceUrl: `${r.ssl ? "https://" : "http://"}${toUnicode(r.fullDomain || "")}/`
-                        }))
-                );
-            }
-        }
-
-        fetchResources();
-    }, [open]);
-
-    async function onSubmit(values: z.infer<typeof formSchema>) {
-        setLoading(true);
-
-        // convert time to seconds
-        let timeInSeconds = values.timeValue;
-        switch (values.timeUnit) {
-            case "minutes":
-                timeInSeconds *= 60;
-                break;
-            case "hours":
-                timeInSeconds *= 60 * 60;
-                break;
-            case "days":
-                timeInSeconds *= 60 * 60 * 24;
-                break;
-            case "weeks":
-                timeInSeconds *= 60 * 60 * 24 * 7;
-                break;
-            case "months":
-                timeInSeconds *= 60 * 60 * 24 * 30;
-                break;
-            case "years":
-                timeInSeconds *= 60 * 60 * 24 * 365;
-                break;
-        }
-
-        const res = await api
-            .post<AxiosResponse<GenerateAccessTokenResponse>>(
-                `/resource/${values.resourceId}/access-token`,
-                {
-                    validForSeconds: neverExpire ? undefined : timeInSeconds,
-                    title:
-                        values.title ||
-                        t('shareLink', {resource: (values.resourceName || "Resource" + values.resourceId)})
-                }
-            )
-            .catch((e) => {
-                console.error(e);
-                toast({
-                    variant: "destructive",
-                    title: t('shareErrorCreate'),
-                    description: formatAxiosError(
-                        e,
-                        t('shareErrorCreateDescription')
-                    )
-                });
-            });
-
-        if (res && res.data.data.accessTokenId) {
-            const token = res.data.data;
-            const link = constructShareLink(token.accessToken);
-            setLink(link);
-
-            setAccessToken(token.accessToken);
-            setAccessTokenId(token.accessTokenId);
-
-            const resource = resources.find(
-                (r) => r.resourceId === values.resourceId
-            );
-
-            onCreated?.({
-                accessTokenId: token.accessTokenId,
-                resourceId: token.resourceId,
-                resourceName: values.resourceName,
-                title: token.title,
-                createdAt: token.createdAt,
-                expiresAt: token.expiresAt
-            });
-        }
-
-        setLoading(false);
-    }
-
-    function getSelectedResourceName(id: number) {
-        const resource = resources.find((r) => r.resourceId === id);
-        return `${resource?.name}`;
-    }
-
-    return (
-        <>
-            <Credenza
-                open={open}
-                onOpenChange={(val) => {
-                    setOpen(val);
-                    setLink(null);
-                    setLoading(false);
-                    form.reset();
-                }}
-            >
-                <CredenzaContent>
-                    <CredenzaHeader>
-                        <CredenzaTitle>{t('shareCreate')}</CredenzaTitle>
-                        <CredenzaDescription>
-                            {t('shareCreateDescription')}
-                        </CredenzaDescription>
-                    </CredenzaHeader>
-                    <CredenzaBody>
-                        <div className="space-y-4">
-                            {!link && (
-                                <Form {...form}>
-                                    <form
-                                        onSubmit={form.handleSubmit(onSubmit)}
-                                        className="space-y-4"
-                                        id="share-link-form"
-                                    >
-                                        <FormField
-                                            control={form.control}
-                                            name="resourceId"
-                                            render={({ field }) => (
-                                                <FormItem className="flex flex-col">
-                                                    <FormLabel>
-                                                        {t('resource')}
-                                                    </FormLabel>
-                                                    <Popover>
-                                                        <PopoverTrigger asChild>
-                                                            <FormControl>
-                                                                <Button
-                                                                    variant="outline"
-                                                                    role="combobox"
-                                                                    className={cn(
-                                                                        "justify-between",
-                                                                        !field.value &&
-                                                                            "text-muted-foreground"
-                                                                    )}
-                                                                >
-                                                                    {field.value
-                                                                        ? getSelectedResourceName(
-                                                                              field.value
-                                                                          )
-                                                                        : t('resourceSelect')}
-                                                                    <CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                                                                </Button>
-                                                            </FormControl>
-                                                        </PopoverTrigger>
-                                                        <PopoverContent className="p-0">
-                                                            <Command>
-                                                                <CommandInput placeholder={t('resourceSearch')} />
-                                                                <CommandList>
-                                                                    <CommandEmpty>
-                                                                        {t('resourcesNotFound')}
-                                                                    </CommandEmpty>
-                                                                    <CommandGroup>
-                                                                        {resources.map(
-                                                                            (
-                                                                                r
-                                                                            ) => (
-                                                                                <CommandItem
-                                                                                    value={`${r.name}:${r.resourceId}`}
-                                                                                    key={
-                                                                                        r.resourceId
-                                                                                    }
-                                                                                    onSelect={() => {
-                                                                                        form.setValue(
-                                                                                            "resourceId",
-                                                                                            r.resourceId
-                                                                                        );
-                                                                                        form.setValue(
-                                                                                            "resourceName",
-                                                                                            r.name
-                                                                                        );
-                                                                                        form.setValue(
-                                                                                            "resourceUrl",
-                                                                                            r.resourceUrl
-                                                                                        );
-                                                                                    }}
-                                                                                >
-                                                                                    <CheckIcon
-                                                                                        className={cn(
-                                                                                            "mr-2 h-4 w-4",
-                                                                                            r.resourceId ===
-                                                                                                field.value
-                                                                                                ? "opacity-100"
-                                                                                                : "opacity-0"
-                                                                                        )}
-                                                                                    />
-                                                                                    {`${r.name}`}
-                                                                                </CommandItem>
-                                                                            )
-                                                                        )}
-                                                                    </CommandGroup>
-                                                                </CommandList>
-                                                            </Command>
-                                                        </PopoverContent>
-                                                    </Popover>
-                                                    <FormMessage />
-                                                </FormItem>
-                                            )}
-                                        />
-
-                                        <FormField
-                                            control={form.control}
-                                            name="title"
-                                            render={({ field }) => (
-                                                <FormItem>
-                                                    <FormLabel>
-                                                        {t('shareTitleOptional')}
-                                                    </FormLabel>
-                                                    <FormControl>
-                                                        <Input {...field} />
-                                                    </FormControl>
-                                                    <FormMessage />
-                                                </FormItem>
-                                            )}
-                                        />
-
-                                        <div className="space-y-4">
-                                            <div className="space-y-2">
-                                                <FormLabel>{t('expireIn')}</FormLabel>
-                                                <div className="grid grid-cols-2 gap-4">
-                                                    <FormField
-                                                        control={form.control}
-                                                        name="timeUnit"
-                                                        render={({ field }) => (
-                                                            <FormItem>
-                                                                <Select
-                                                                    onValueChange={
-                                                                        field.onChange
-                                                                    }
-                                                                    defaultValue={field.value.toString()}
-                                                                >
-                                                                    <FormControl>
-                                                                        <SelectTrigger className="w-full">
-                                                                            <SelectValue placeholder={t('selectDuration')} />
-                                                                        </SelectTrigger>
-                                                                    </FormControl>
-                                                                    <SelectContent>
-                                                                        {timeUnits.map(
-                                                                            (
-                                                                                option
-                                                                            ) => (
-                                                                                <SelectItem
-                                                                                    key={
-                                                                                        option.unit
-                                                                                    }
-                                                                                    value={
-                                                                                        option.unit
-                                                                                    }
-                                                                                >
-                                                                                    {
-                                                                                        option.name
-                                                                                    }
-                                                                                </SelectItem>
-                                                                            )
-                                                                        )}
-                                                                    </SelectContent>
-                                                                </Select>
-                                                                <FormMessage />
-                                                            </FormItem>
-                                                        )}
-                                                    />
-
-                                                    <FormField
-                                                        control={form.control}
-                                                        name="timeValue"
-                                                        render={({ field }) => (
-                                                            <FormItem>
-                                                                <FormControl>
-                                                                    <Input
-                                                                        type="number"
-                                                                        min={1}
-                                                                        {...field}
-                                                                    />
-                                                                </FormControl>
-                                                                <FormMessage />
-                                                            </FormItem>
-                                                        )}
-                                                    />
-                                                </div>
-                                            </div>
-
-                                            <div className="flex items-center space-x-2">
-                                                <Checkbox
-                                                    id="terms"
-                                                    checked={neverExpire}
-                                                    onCheckedChange={(val) =>
-                                                        setNeverExpire(
-                                                            val as boolean
-                                                        )
-                                                    }
-                                                />
-                                                <label
-                                                    htmlFor="terms"
-                                                    className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                                                >
-                                                    {t('neverExpire')}
-                                                </label>
-                                            </div>
-
-                                            <p className="text-sm text-muted-foreground">
-                                                {t('shareExpireDescription')}
-                                            </p>
-                                        </div>
-                                    </form>
-                                </Form>
-                            )}
-                            {link && (
-                                <div className="max-w-md space-y-4">
-                                    <p>
-                                        {t('shareSeeOnce')}
-                                    </p>
-                                    <p>
-                                        {t('shareAccessHint')}
-                                    </p>
-
-                                    <div className="h-[250px] w-full mx-auto flex items-center justify-center">
-                                        <QRCodeCanvas value={link} size={200} />
-                                    </div>
-
-                                    <Collapsible
-                                        open={isOpen}
-                                        onOpenChange={setIsOpen}
-                                        className="space-y-2"
-                                    >
-                                        <div className="mx-auto">
-                                            <CopyTextBox
-                                                text={link}
-                                                wrapText={false}
-                                            />
-                                        </div>
-                                        <div className="flex items-center justify-between space-x-4">
-                                            <CollapsibleTrigger asChild>
-                                                <Button
-                                                    variant="text"
-                                                    size="sm"
-                                                    className="p-0 flex items-center justify-between w-full"
-                                                >
-                                                    <h4 className="text-sm font-semibold">
-                                                        {t('shareTokenUsage')}
-                                                    </h4>
-                                                    <div>
-                                                        <ChevronsUpDown className="h-4 w-4" />
-                                                        <span className="sr-only">
-                                                            {t('toggle')}
-                                                        </span>
-                                                    </div>
-                                                </Button>
-                                            </CollapsibleTrigger>
-                                        </div>
-                                        <CollapsibleContent className="space-y-2">
-                                            {accessTokenId && accessToken && (
-                                                <div className="space-y-2">
-                                                    <div className="mx-auto">
-                                                        <AccessTokenSection
-                                                            tokenId={
-                                                                accessTokenId
-                                                            }
-                                                            token={accessToken}
-                                                            resourceUrl={form.getValues(
-                                                                "resourceUrl"
-                                                            )}
-                                                        />
-                                                    </div>
-                                                </div>
-                                            )}
-                                        </CollapsibleContent>
-                                    </Collapsible>
-                                </div>
-                            )}
-                        </div>
-                    </CredenzaBody>
-                    <CredenzaFooter>
-                        <CredenzaClose asChild>
-                            <Button variant="outline">{t('close')}</Button>
-                        </CredenzaClose>
-                        <Button
-                            type="button"
-                            onClick={form.handleSubmit(onSubmit)}
-                            loading={loading}
-                            disabled={link !== null || loading}
-                        >
-                            {t('createLink')}
-                        </Button>
-                    </CredenzaFooter>
-                </CredenzaContent>
-            </Credenza>
-        </>
-    );
-}
diff --git a/src/app/[orgId]/settings/share-links/ShareLinksTable.tsx b/src/app/[orgId]/settings/share-links/ShareLinksTable.tsx
deleted file mode 100644
index 2943311f..00000000
--- a/src/app/[orgId]/settings/share-links/ShareLinksTable.tsx
+++ /dev/null
@@ -1,298 +0,0 @@
-"use client";
-
-import { ColumnDef } from "@tanstack/react-table";
-import { ShareLinksDataTable } from "@app/components/ShareLinksDataTable";
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger
-} from "@app/components/ui/dropdown-menu";
-import { Button } from "@app/components/ui/button";
-import {
-    Copy,
-    ArrowRight,
-    ArrowUpDown,
-    MoreHorizontal,
-    Check,
-    ArrowUpRight,
-    ShieldOff,
-    ShieldCheck
-} from "lucide-react";
-import Link from "next/link";
-import { useRouter } from "next/navigation";
-// import CreateResourceForm from "./CreateResourceForm";
-import { useState } from "react";
-import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
-import { formatAxiosError } from "@app/lib/api";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient } from "@app/lib/api";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { ArrayElement } from "@server/types/ArrayElement";
-import { ListAccessTokensResponse } from "@server/routers/accessToken";
-import moment from "moment";
-import CreateShareLinkForm from "@app/components/CreateShareLinkForm";
-import { constructShareLink } from "@app/lib/shareLinks";
-import { useTranslations } from "next-intl";
-
-export type ShareLinkRow = {
-    accessTokenId: string;
-    resourceId: number;
-    resourceName: string;
-    title: string | null;
-    createdAt: number;
-    expiresAt: number | null;
-};
-
-type ShareLinksTableProps = {
-    shareLinks: ShareLinkRow[];
-    orgId: string;
-};
-
-export default function ShareLinksTable({
-    shareLinks,
-    orgId
-}: ShareLinksTableProps) {
-    const router = useRouter();
-    const t = useTranslations();
-
-    const api = createApiClient(useEnvContext());
-
-    const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
-    const [rows, setRows] = useState<ShareLinkRow[]>(shareLinks);
-
-    function formatLink(link: string) {
-        return link.substring(0, 20) + "..." + link.substring(link.length - 20);
-    }
-
-    async function deleteSharelink(id: string) {
-        await api.delete(`/access-token/${id}`).catch((e) => {
-            toast({
-                title: t("shareErrorDelete"),
-                description: formatAxiosError(e, t("shareErrorDeleteMessage"))
-            });
-        });
-
-        const newRows = rows.filter((r) => r.accessTokenId !== id);
-        setRows(newRows);
-
-        toast({
-            title: t("shareDeleted"),
-            description: t("shareDeletedDescription")
-        });
-    }
-
-    const columns: ColumnDef<ShareLinkRow>[] = [
-        {
-            accessorKey: "resourceName",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("resource")}
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                const r = row.original;
-                return (
-                    <Link href={`/${orgId}/settings/resources/${r.resourceId}`}>
-                        <Button variant="outline" size="sm">
-                            {r.resourceName}
-                            <ArrowUpRight className="ml-2 h-4 w-4" />
-                        </Button>
-                    </Link>
-                );
-            }
-        },
-        {
-            accessorKey: "title",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("title")}
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            }
-        },
-        // {
-        //     accessorKey: "domain",
-        //     header: "Link",
-        //     cell: ({ row }) => {
-        //         const r = row.original;
-        //
-        //         const link = constructShareLink(
-        //             r.resourceId,
-        //             r.accessTokenId,
-        //             r.tokenHash
-        //         );
-        //
-        //         return (
-        //             <div className="flex items-center">
-        //                 <Link
-        //                     href={link}
-        //                     target="_blank"
-        //                     rel="noopener noreferrer"
-        //                     className="hover:underline mr-2"
-        //                 >
-        //                     {formatLink(link)}
-        //                 </Link>
-        //                 <Button
-        //                     variant="ghost"
-        //                     className="h-6 w-6 p-0"
-        //                     onClick={() => {
-        //                         navigator.clipboard.writeText(link);
-        //                         const originalIcon = document.querySelector(
-        //                             `#icon-${r.accessTokenId}`
-        //                         );
-        //                         if (originalIcon) {
-        //                             originalIcon.classList.add("hidden");
-        //                         }
-        //                         const checkIcon = document.querySelector(
-        //                             `#check-icon-${r.accessTokenId}`
-        //                         );
-        //                         if (checkIcon) {
-        //                             checkIcon.classList.remove("hidden");
-        //                             setTimeout(() => {
-        //                                 checkIcon.classList.add("hidden");
-        //                                 if (originalIcon) {
-        //                                     originalIcon.classList.remove(
-        //                                         "hidden"
-        //                                     );
-        //                                 }
-        //                             }, 2000);
-        //                         }
-        //                     }}
-        //                 >
-        //                     <Copy
-        //                         id={`icon-${r.accessTokenId}`}
-        //                         className="h-4 w-4"
-        //                     />
-        //                     <Check
-        //                         id={`check-icon-${r.accessTokenId}`}
-        //                         className="hidden text-green-500 h-4 w-4"
-        //                     />
-        //                     <span className="sr-only">Copy link</span>
-        //                 </Button>
-        //             </div>
-        //         );
-        //     }
-        // },
-        {
-            accessorKey: "createdAt",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("created")}
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                const r = row.original;
-                return moment(r.createdAt).format("lll");
-            }
-        },
-        {
-            accessorKey: "expiresAt",
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("expires")}
-                        <ArrowUpDown className="ml-2 h-4 w-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                const r = row.original;
-                if (r.expiresAt) {
-                    return moment(r.expiresAt).format("lll");
-                }
-                return t("never");
-            }
-        },
-        {
-            id: "delete",
-            cell: ({ row }) => {
-                const resourceRow = row.original;
-                return (
-                    <div className="flex items-center justify-end space-x-2">
-                        {/* <DropdownMenu> */}
-                        {/*     <DropdownMenuTrigger asChild> */}
-                        {/*         <Button variant="ghost" className="h-8 w-8 p-0"> */}
-                        {/*             <span className="sr-only"> */}
-                        {/*                 {t("openMenu")} */}
-                        {/*             </span> */}
-                        {/*             <MoreHorizontal className="h-4 w-4" /> */}
-                        {/*         </Button> */}
-                        {/*     </DropdownMenuTrigger> */}
-                        {/*     <DropdownMenuContent align="end"> */}
-                        {/*         <DropdownMenuItem */}
-                        {/*             onClick={() => { */}
-                        {/*                 deleteSharelink( */}
-                        {/*                     resourceRow.accessTokenId */}
-                        {/*                 ); */}
-                        {/*             }} */}
-                        {/*         > */}
-                        {/*             <button className="text-red-500"> */}
-                        {/*                 {t("delete")} */}
-                        {/*             </button> */}
-                        {/*         </DropdownMenuItem> */}
-                        {/*     </DropdownMenuContent> */}
-                        {/* </DropdownMenu> */}
-                        <Button
-                            variant="secondary"
-                            size="sm"
-                            onClick={() =>
-                                deleteSharelink(row.original.accessTokenId)
-                            }
-                        >
-                            {t("delete")}
-                        </Button>
-                    </div>
-                );
-            }
-        }
-    ];
-
-    return (
-        <>
-            <CreateShareLinkForm
-                open={isCreateModalOpen}
-                setOpen={setIsCreateModalOpen}
-                onCreated={(val) => {
-                    setRows([val, ...rows]);
-                }}
-            />
-
-            <ShareLinksDataTable
-                columns={columns}
-                data={rows}
-                createShareLink={() => {
-                    setIsCreateModalOpen(true);
-                }}
-            />
-        </>
-    );
-}
diff --git a/src/app/[orgId]/settings/share-links/page.tsx b/src/app/[orgId]/settings/share-links/page.tsx
index be561acd..caf02b83 100644
--- a/src/app/[orgId]/settings/share-links/page.tsx
+++ b/src/app/[orgId]/settings/share-links/page.tsx
@@ -8,7 +8,6 @@ import { GetOrgResponse } from "@server/routers/org";
 import OrgProvider from "@app/providers/OrgProvider";
 import { ListAccessTokensResponse } from "@server/routers/accessToken";
 import ShareLinksTable, { ShareLinkRow } from "../../../../components/ShareLinksTable";
-import ShareableLinksSplash from "../../../../components/ShareLinksSplash";
 import { getTranslations } from "next-intl/server";
 
 type ShareLinksPageProps = {