diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
index 2668b6cc8..cd8614e9b 100644
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
@@ -7,6 +7,7 @@ import { useSession } from 'next-auth/react';
 import { match } from 'ts-pattern';
 
 import { getFile } from '@documenso/lib/universal/upload/get-file';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { Document, Recipient, User } from '@documenso/prisma/client';
 import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';
 import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
@@ -39,8 +40,7 @@ export const DataTableActionButton = ({ row, teamUrl }: DataTableActionButtonPro
   const isComplete = row.status === DocumentStatus.COMPLETED;
   const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
 
-  // Todo: Teams - Extract calculation.
-  const documentsPath = teamUrl ? `/t/${teamUrl}/documents` : '/documents';
+  const documentsPath = formatDocumentsPath(teamUrl);
 
   const onDownloadClick = async () => {
     try {
diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
index 1414ec851..5abe7a30c 100644
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
@@ -18,6 +18,7 @@ import {
 import { useSession } from 'next-auth/react';
 
 import { getFile } from '@documenso/lib/universal/upload/get-file';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import type { Document, Recipient, User } from '@documenso/prisma/client';
 import { DocumentStatus } from '@documenso/prisma/client';
 import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
@@ -63,7 +64,7 @@ export const DataTableActionDropdown = ({ row, teamUrl }: DataTableActionDropdow
   // const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
   const isDocumentDeletable = isOwner;
 
-  const documentsPath = teamUrl ? `/t/${teamUrl}/documents` : '/documents';
+  const documentsPath = formatDocumentsPath(teamUrl);
 
   const onDownloadClick = async () => {
     let document: DocumentWithData | null = null;
diff --git a/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx b/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
index 0a3912e7e..fe9f6144e 100644
--- a/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
@@ -1,5 +1,6 @@
 import { useRouter } from 'next/navigation';
 
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { trpc as trpcReact } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -39,7 +40,7 @@ export const DuplicateDocumentDialog = ({
       }
     : undefined;
 
-  const documentsPath = teamUrl ? `/t/${teamUrl}/documents` : '/documents';
+  const documentsPath = formatDocumentsPath(teamUrl);
 
   const { mutateAsync: duplicateDocument, isLoading: isDuplicateLoading } =
     trpcReact.document.duplicateDocument.useMutation({
diff --git a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx
index 861ed3b78..2809cefe5 100644
--- a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx
+++ b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx
@@ -38,7 +38,6 @@ export const MobileNav = ({ className, ...props }: MobileNavProps) => {
         </Button>
       </Link>
 
-      {/* Todo: Teams */}
       <Link href="/settings/teams">
         <Button
           variant="ghost"
diff --git a/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx b/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx
index f156d6abb..a297caa08 100644
--- a/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx
+++ b/apps/web/src/components/(teams)/tables/team-billing-invoices-data-table.tsx
@@ -126,10 +126,9 @@ export default function TeamBillingInvoicesDataTable({
         rows: 3,
         component: (
           <>
-            {/* Todo: Teams */}
             <TableCell className="w-1/3 py-4 pr-4">
               <div className="flex w-full flex-row items-center">
-                <Skeleton className="h-12 w-12 flex-shrink-0 rounded-full" />
+                <Skeleton className="h-7 w-7 flex-shrink-0 rounded" />
 
                 <div className="ml-2 flex flex-grow flex-col">
                   <Skeleton className="h-4 w-1/2 max-w-[8rem]" />
diff --git a/packages/lib/server-only/team/find-team-member-invites.ts b/packages/lib/server-only/team/find-team-member-invites.ts
index 13dd1cea7..f5eb52568 100644
--- a/packages/lib/server-only/team/find-team-member-invites.ts
+++ b/packages/lib/server-only/team/find-team-member-invites.ts
@@ -38,7 +38,6 @@ export const findTeamMemberInvites = async ({
           userId,
         },
       },
-      // Todo: Teams - Should only certain roles be able to find members?
     },
   });
 
diff --git a/packages/lib/server-only/team/find-team-members.ts b/packages/lib/server-only/team/find-team-members.ts
index fe75958e6..cc62ee03d 100644
--- a/packages/lib/server-only/team/find-team-members.ts
+++ b/packages/lib/server-only/team/find-team-members.ts
@@ -1,9 +1,10 @@
 import { P, match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
-import { Prisma, TeamMember } from '@documenso/prisma/client';
+import type { TeamMember } from '@documenso/prisma/client';
+import { Prisma } from '@documenso/prisma/client';
 
-import { FindResultSet } from '../../types/find-result-set';
+import type { FindResultSet } from '../../types/find-result-set';
 
 export interface FindTeamMembersOptions {
   userId: number;
@@ -37,7 +38,6 @@ export const findTeamMembers = async ({
           userId,
         },
       },
-      // Todo: Teams - Should only certain roles be able to find members?
     },
   });
 
diff --git a/packages/lib/server-only/team/transfer-team-ownership.ts b/packages/lib/server-only/team/transfer-team-ownership.ts
index bc494d96e..48bc79f29 100644
--- a/packages/lib/server-only/team/transfer-team-ownership.ts
+++ b/packages/lib/server-only/team/transfer-team-ownership.ts
@@ -53,8 +53,6 @@ export const transferTeamOwnership = async ({ token }: TransferTeamOwnershipOpti
       );
     }
 
-    // Todo: Teams - Add billing message in email indicating that billing will be passed on when transferring a team.
-
     await tx.team.update({
       where: {
         id: team.id,
diff --git a/packages/lib/utils/teams.ts b/packages/lib/utils/teams.ts
index a7f844f71..ed4c0b217 100644
--- a/packages/lib/utils/teams.ts
+++ b/packages/lib/utils/teams.ts
@@ -5,3 +5,7 @@ export const formatTeamUrl = (teamUrl: string, baseUrl?: string) => {
 
   return `${formattedBaseUrl}/t/${teamUrl}`;
 };
+
+export const formatDocumentsPath = (teamUrl?: string) => {
+  return teamUrl ? `/t/${teamUrl}/documents` : '/documents';
+};