diff --git a/.env b/.env
index 0102e354f..fa501f3de 100644
--- a/.env
+++ b/.env
@@ -4,8 +4,6 @@ NEXT_PUBLIC_API_URL=https://beta.api.opensauced.pizza/v2
 NEXT_PUBLIC_EXP_API_URL=https://beta.api.opensauced.pizza/v2
 NEXT_PUBLIC_POSTHOG_ID=phc_Y0xz6nK55MEwWjobJsI2P8rsiomZJ6eZLoXehmMy9tt
 NEXT_PUBLIC_CLOUD_NAME=dgxgziswe
-NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=test
-NEXT_PUBLIC_STRIPE_SUB_CANCEL_URL=https://billing.stripe.com/p/login/test_bIY8xy3iy6fpeHu3cc
 SENTRY_DSN=https://3f5bb9023ff0407299dd22a6454558f9@o4504872488927232.ingest.sentry.io/4505082236960768
 NEXT_PUBLIC_SENTRY_DSN=https://3f5bb9023ff0407299dd22a6454558f9@o4504872488927232.ingest.sentry.io/4505082236960768
 
diff --git a/CODEOWNERS b/CODEOWNERS
index bc0459326..3081355ba 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -51,7 +51,6 @@ components/StarSearch/SuggestedPrompts.tsx @zeucapua @nickytonline @brandonrober
 components/TabList/tab-list.tsx @zeucapua @jpmcb @brandonroberts
 components/Tables/ContributorsGrid.tsx @zeucapua @brandonroberts @nickytonline
 components/Tables/ContributorsTable.tsx @zeucapua @zeucapua @brandonroberts
-components/Workspaces/InsightUpgradeModal.tsx @brandonroberts
 components/Workspaces/TrackedRepoWizard/PasteReposStep.tsx @brandonroberts @nickytonline @zeucapua
 components/Workspaces/TrackedReposTable.tsx @nickytonline @brandonroberts
 components/Workspaces/WorkspaceCard.tsx @brandonroberts @zeucapua
@@ -84,7 +83,6 @@ components/molecules/DevProfile/dev-profile.tsx @nickytonline @zeucapua @brandon
 components/molecules/FilterHeader/filter-header.tsx @brandonroberts
 components/molecules/HighlightInput/highlight-input-form.tsx @zeucapua
 components/molecules/HoverCardWrapper/hover-card-wrapper.tsx @nickytonline @zeucapua
-components/molecules/InsightHeader/insight-header.tsx @zeucapua @zeucapua @brandonroberts
 components/molecules/ListCard/list-card.tsx @nickytonline @brandonroberts
 components/molecules/NewsletterForm/newsletter-form.stories.tsx @brandonroberts @jpmcb @zeucapua
 components/molecules/NewsletterForm/newsletter-form.tsx @brandonroberts @zeucapua @nickytonline
diff --git a/components/ListHeader/list-header.tsx b/components/ListHeader/list-header.tsx
index f738488a7..a893a2f84 100644
--- a/components/ListHeader/list-header.tsx
+++ b/components/ListHeader/list-header.tsx
@@ -2,8 +2,6 @@ import { FaEdit } from "react-icons/fa";
 import { FiCopy } from "react-icons/fi";
 import { usePostHog } from "posthog-js/react";
 
-import dynamic from "next/dynamic";
-import { useState } from "react";
 import { useRouter } from "next/router";
 import Button from "components/shared/Button/button";
 import Title from "components/atoms/Typography/title";
@@ -16,8 +14,6 @@ import StackedOwners from "components/Workspaces/StackedOwners";
 import { shortenUrl } from "lib/utils/shorten-url";
 import { writeToClipboard } from "lib/utils/write-to-clipboard";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 interface ListHeaderProps {
   name: string;
   listId: string;
@@ -26,7 +22,6 @@ interface ListHeaderProps {
   isOwner: boolean;
   numberOfContributors: number;
   owners?: string[];
-  overLimit?: boolean;
 }
 
 const ListHeader = ({
@@ -37,12 +32,10 @@ const ListHeader = ({
   isOwner,
   numberOfContributors,
   owners,
-  overLimit,
 }: ListHeaderProps): JSX.Element => {
   const { toast } = useToast();
   const posthog = usePostHog();
   const router = useRouter();
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
 
   const handleCopyToClipboard = async () => {
     const url = new URL(window.location.href).toString();
@@ -90,11 +83,6 @@ const ListHeader = ({
           <Button
             variant="primary"
             onClick={() => {
-              if (overLimit) {
-                setIsInsightUpgradeModalOpen(true);
-                return;
-              }
-
               router.push(`/workspaces/${workspaceId}/contributor-insights/${listId}/edit`);
             }}
           >
@@ -102,15 +90,6 @@ const ListHeader = ({
           </Button>
         )}
       </div>
-      {workspaceId && (
-        <InsightUpgradeModal
-          workspaceId={workspaceId}
-          variant="all"
-          isOpen={isInsightUpgradeModalOpen}
-          onClose={() => setIsInsightUpgradeModalOpen(false)}
-          overLimit={0}
-        />
-      )}
     </div>
   );
 };
diff --git a/components/Workspaces/InsightUpgradeModal.tsx b/components/Workspaces/InsightUpgradeModal.tsx
deleted file mode 100644
index 64d48c444..000000000
--- a/components/Workspaces/InsightUpgradeModal.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-import { ReactNode, useEffect } from "react";
-import { FaRegCheckCircle } from "react-icons/fa";
-import { usePostHog } from "posthog-js/react";
-import { useRouter } from "next/router";
-import { Dialog, DialogTitle, DialogContent, DialogCloseButton } from "components/molecules/Dialog/dialog";
-import Button from "components/shared/Button/button";
-import Card from "components/atoms/Card/card";
-import { useMediaQuery } from "lib/hooks/useMediaQuery";
-import { Drawer } from "components/shared/Drawer";
-
-type InsightUpgradeModalProps = {
-  workspaceId: string;
-  overLimit?: number;
-  variant: "repositories" | "contributors" | "workspace" | "all";
-  isOpen: boolean;
-  onClose: () => void;
-};
-
-export default function InsightUpgradeModal({ workspaceId, variant, isOpen, onClose }: InsightUpgradeModalProps) {
-  const posthog = usePostHog();
-  const isMobile = useMediaQuery("(max-width: 768px)");
-  const router = useRouter();
-
-  const title = variant !== "workspace" ? "This Workspace is over the free limit" : "Upgrade to a PRO Workspace";
-  const description =
-    variant !== "workspace"
-      ? `Your workspace has exceeded the limit for free usage. Free Workspaces only allow for 20 repositories
-    and 10 contributors tracked per insight page and 100 workspace repositories. Don't worry, your insights won't be deleted. If you want to
-    continue using OpenSauced you should upgrade your Workspace to a PRO Account.`
-      : `Setting your workspace to private is a PRO feature. Upgrade your Workspace and get exclusive access to
-    your work for you and your team!`;
-  useEffect(() => {
-    if (isOpen) {
-      posthog.capture("clicked: Upgrade Workspace Modal", { workspaceId });
-    }
-  }, [isOpen]);
-
-  return isMobile ? (
-    <Drawer title={title} description={description} isOpen={isOpen} onClose={onClose} trigger={null}>
-      <section className="flex flex-col gap-4 justify-between w-full max-h-64 overflow-y-scroll">
-        <Card className="basis-1/2 px-4 py-4 flex flex-col gap-4 justify-between">
-          <div className="flex items-center justify-between">
-            <div className="flex flex-col gap-0.5">
-              <h3 className="font-semibold">Pro Workspace</h3>
-              <p className="text-xs text-slate-500">Ideal for teams </p>
-            </div>
-
-            <div className="flex flex-col gap-0.5 items-end">
-              <p className="text-2xl font-semibold">
-                <span className="text-lg">$</span>9<span className="text-lg text-slate-500">/mth</span>
-              </p>
-              <p className="text-xs font-semibold text-slate-500">charged per Workspace</p>
-            </div>
-          </div>
-
-          <ul className="flex flex-col gap-3">
-            <ChecklistItem color="green">Private or public Workspaces, you choose!</ChecklistItem>
-            <ChecklistItem color="green">
-              Up to <span className="font-bold">1,000</span> workspace repositories
-            </ChecklistItem>
-            <ChecklistItem color="green">
-              Up to <span className="font-bold">100</span> contributors per insight page
-            </ChecklistItem>
-            <ChecklistItem color="green">
-              Up to <span className="font-bold">100</span> repositories per insight page
-            </ChecklistItem>
-          </ul>
-
-          <Button
-            onClick={() => {
-              if (variant !== "workspace") {
-                router.push(`/workspaces/${workspaceId}/settings#upgrade`);
-              }
-              if (variant === "workspace" || variant === "all") onClose();
-            }}
-            variant="primary"
-            className="flex justify-center"
-          >
-            Upgrade
-          </Button>
-        </Card>
-
-        <Card className="basis-1/2 px-4 py-4 flex flex-col gap-4 justify-between">
-          <div className="flex items-center justify-between">
-            <div className="flex flex-col gap-0.5">
-              <h3 className="font-semibold">Free Workspace</h3>
-              <p className="text-xs text-slate-500">Ideal for individuals</p>
-            </div>
-
-            <p className="text-2xl font-semibold">
-              <span className="text-lg">$</span>0<span className="text-lg text-slate-500">/mth</span>
-            </p>
-          </div>
-
-          <ul className="flex flex-col gap-3">
-            <ChecklistItem color="orange">Public Workspaces only!</ChecklistItem>
-            <ChecklistItem color="orange">
-              Up to <span className="font-bold">100</span> workspace repositories
-            </ChecklistItem>
-            <ChecklistItem color="orange">
-              Up to <span className="font-bold">10</span> contributors per insight page
-            </ChecklistItem>
-            <ChecklistItem color="orange">
-              Up to <span className="font-bold">20</span> repositories per insight page
-            </ChecklistItem>
-          </ul>
-
-          <Button
-            variant="default"
-            className="flex w-full py-3 justify-center !border !border-orange-600 !text-orange-600"
-          >
-            Your Plan
-          </Button>
-        </Card>
-      </section>
-    </Drawer>
-  ) : (
-    <Dialog open={isOpen}>
-      <DialogContent autoStyle={false} onEscapeKeyDown={onClose} onPointerDownOutside={onClose}>
-        <Card className="p-8 max-w-4xl">
-          <div className="min-w-[712px] flex flex-col gap-8">
-            <DialogCloseButton onClick={onClose} />
-            <section className="flex flex-col gap-2">
-              <DialogTitle className="text-xl">{title}</DialogTitle>
-              <p className="text-sm text-slate-500">{description}</p>
-            </section>
-
-            <section className="flex gap-8 justify-between w-full">
-              <Card className="basis-1/2 px-6 py-6 flex flex-col gap-6 justify-between">
-                <div className="flex items-center justify-between">
-                  <div className="flex flex-col gap-0.5">
-                    <h3 className="text-lg font-semibold">Free Workspace</h3>
-                    <p className="text-sm text-slate-500">Ideal for individuals</p>
-                  </div>
-
-                  <p className="text-4xl font-semibold">
-                    <span className="text-lg">$</span>0<span className="text-2xl text-slate-500">/mth</span>
-                  </p>
-                </div>
-
-                <ul className="flex flex-col gap-3">
-                  <ChecklistItem color="orange">Public Workspaces only!</ChecklistItem>
-                  <ChecklistItem color="orange">
-                    Up to <span className="font-bold">100</span> workspace repositories
-                  </ChecklistItem>
-                  <ChecklistItem color="orange">
-                    Up to <span className="font-bold">10</span> contributors per insight page
-                  </ChecklistItem>
-                  <ChecklistItem color="orange">
-                    Up to <span className="font-bold">20</span> repositories per insight page
-                  </ChecklistItem>
-                </ul>
-
-                <Button
-                  variant="default"
-                  className="flex w-full py-3 justify-center !border !border-orange-600 !text-orange-600"
-                >
-                  Your Plan
-                </Button>
-              </Card>
-
-              <Card className="basis-1/2 px-6 py-6 flex flex-col gap-6 justify-between">
-                <div className="flex items-center justify-between">
-                  <div className="flex flex-col gap-0.5">
-                    <h3 className="text-lg font-semibold">Pro Workspace</h3>
-                    <p className="text-sm text-slate-500">Ideal for teams </p>
-                  </div>
-
-                  <div className="flex flex-col gap-0.5 items-end">
-                    <p className="text-4xl font-semibold">
-                      <span className="text-xl">$</span>9<span className="text-2xl text-slate-500">/mth</span>
-                    </p>
-                    <p className="text-xs font-semibold text-slate-500">charged per Workspace</p>
-                  </div>
-                </div>
-
-                <ul className="flex flex-col gap-3">
-                  <ChecklistItem color="green">Private or public Workspaces, you choose!</ChecklistItem>
-                  <ChecklistItem color="green">
-                    Up to <span className="font-bold">1,000</span> workspace repositories
-                  </ChecklistItem>
-                  <ChecklistItem color="green">
-                    Up to <span className="font-bold">100</span> contributors per insight page
-                  </ChecklistItem>
-                  <ChecklistItem color="green">
-                    Up to <span className="font-bold">100</span> repositories per insight page
-                  </ChecklistItem>
-                </ul>
-
-                <Button
-                  onClick={() => {
-                    if (variant !== "workspace") {
-                      router.push(`/workspaces/${workspaceId}/settings#upgrade`);
-                    }
-                    if (variant === "workspace" || variant === "all") onClose();
-                  }}
-                  variant="primary"
-                  className="py-3 flex justify-center"
-                >
-                  Upgrade
-                </Button>
-              </Card>
-            </section>
-          </div>
-        </Card>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-function ChecklistItem({ color, children }: { color: "orange" | "green"; children: ReactNode }) {
-  return (
-    <li className="flex gap-3 items-center">
-      <FaRegCheckCircle className={`w-5 h-5 text-${color}-500`} />
-      <p className="text-sm text-slate-500">{children}</p>
-    </li>
-  );
-}
diff --git a/components/Workspaces/WorkspaceBanner.tsx b/components/Workspaces/WorkspaceBanner.tsx
deleted file mode 100644
index 0178c6e3c..000000000
--- a/components/Workspaces/WorkspaceBanner.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { usePostHog } from "posthog-js/react";
-import { useEffect } from "react";
-
-type WorkspaceBannerProps = {
-  workspaceId: string;
-  openModal: () => void;
-};
-
-export default function WorkspaceBanner({ workspaceId, openModal }: WorkspaceBannerProps) {
-  const posthog = usePostHog();
-
-  useEffect(() => {
-    posthog.capture("shown: Upgrade Workspace Banner", { workspaceId });
-  }, []);
-
-  return (
-    <button onClick={openModal} className="inset-x-0 w-full h-fit px-4 py-2 bg-light-orange-10 text-white">
-      This workspace is over the free limit. <span className="font-bold underline">Upgrade to a PRO Workspace.</span>
-    </button>
-  );
-}
diff --git a/components/molecules/InsightHeader/insight-header.tsx b/components/molecules/InsightHeader/insight-header.tsx
index 2d749b403..041882ae9 100644
--- a/components/molecules/InsightHeader/insight-header.tsx
+++ b/components/molecules/InsightHeader/insight-header.tsx
@@ -5,7 +5,6 @@ import { usePostHog } from "posthog-js/react";
 import { FiCopy } from "react-icons/fi";
 
 import { useRouter } from "next/router";
-import dynamic from "next/dynamic";
 import getRepoInsights from "lib/utils/get-repo-insights";
 import Button from "components/shared/Button/button";
 import Title from "components/atoms/Typography/title";
@@ -21,8 +20,6 @@ import { useMediaQuery } from "lib/hooks/useMediaQuery";
 import CardRepoList from "../CardRepoList/card-repo-list";
 import ComponentDateFilter from "../ComponentDateFilter/component-date-filter";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 interface InsightHeaderProps {
   insight?: DbUserInsight;
   repositories?: number[];
@@ -30,7 +27,6 @@ interface InsightHeaderProps {
   canEdit: boolean | undefined;
   workspaceId?: string;
   owners?: string[];
-  overLimit?: boolean;
 }
 
 const InsightHeader = ({
@@ -40,14 +36,12 @@ const InsightHeader = ({
   canEdit,
   workspaceId,
   owners,
-  overLimit,
 }: InsightHeaderProps): JSX.Element => {
   const router = useRouter();
   const { range } = router.query;
   const { data: repoData, meta: repoMeta } = useRepositories(repositories);
   const { repoList } = getRepoInsights(repoData);
   const [insightPageLink, setInsightPageLink] = useState("");
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
   const { toast } = useToast();
   const posthog = usePostHog();
   const isMobile = useMediaQuery("(max-width: 768px)");
diff --git a/components/organisms/Reports/reports.tsx b/components/organisms/Reports/reports.tsx
index 13a1a3ba9..a89b91848 100644
--- a/components/organisms/Reports/reports.tsx
+++ b/components/organisms/Reports/reports.tsx
@@ -6,10 +6,8 @@ import GitHubIcon from "img/icons/github-icon.svg";
 import Button from "components/shared/Button/button";
 import Icon from "components/atoms/Icon/icon";
 import Title from "components/atoms/Typography/title";
-import Text from "components/atoms/Typography/text";
 import ReportsHistory from "components/molecules/ReportsHistory/reports-history";
 import SelectReportsFilter from "components/molecules/SelectReportsFilter/select-reports-filter";
-import StripeCheckoutButton from "components/organisms/StripeCheckoutButton/stripe-checkout-button";
 
 import { Report } from "interfaces/report-type";
 
@@ -20,12 +18,11 @@ import getCurrentDate from "lib/utils/get-current-date";
 const USERDEVICESTORAGENAME = "reportState";
 
 interface ReportsProps {
-  hasReports?: boolean;
   waitlisted?: boolean;
   repositories?: number[];
 }
 
-const Reports = ({ hasReports, repositories }: ReportsProps): JSX.Element => {
+const Reports = ({ repositories }: ReportsProps): JSX.Element => {
   const userDeviceState = localStorage.getItem(USERDEVICESTORAGENAME);
   const initialState = userDeviceState ? JSON.parse(userDeviceState as string) : [];
   const [reports, setReports] = useState<Report[]>(initialState);
@@ -64,28 +61,19 @@ const Reports = ({ hasReports, repositories }: ReportsProps): JSX.Element => {
         </Title>
         <hr className="border-light-slate-6 my-4" />
         {user ? (
-          hasReports ? (
-            <>
-              <SelectReportsFilter filterList={filterList} callback={handleFilterClick} />
+          <>
+            <SelectReportsFilter filterList={filterList} callback={handleFilterClick} />
 
-              {reports.length > 0 && (
-                <>
-                  <Title className=" relative mt-16" level={3}>
-                    Download History
-                  </Title>
-                  <hr className="border-light-slate-6 my-4" />
-                  <ReportsHistory reportList={reports} repositories={repositories} />
-                </>
-              )}
-            </>
-          ) : (
-            <>
-              <Text>Upgrade to a subscription to gain access to generate custom reports!</Text>
-              <p className="flex justify-center py-4 px-2">
-                <StripeCheckoutButton variant="primary" className="w-52 h-[38px] flex justify-center" />
-              </p>
-            </>
-          )
+            {reports.length > 0 && (
+              <>
+                <Title className=" relative mt-16" level={3}>
+                  Download History
+                </Title>
+                <hr className="border-light-slate-6 my-4" />
+                <ReportsHistory reportList={reports} repositories={repositories} />
+              </>
+            )}
+          </>
         ) : (
           <div className="flex justify-center py-4">
             <Button variant="primary" onClick={async () => await signIn({ provider: "github" })}>
diff --git a/components/organisms/StripeCheckoutButton/stripe-checkout-button.tsx b/components/organisms/StripeCheckoutButton/stripe-checkout-button.tsx
deleted file mode 100644
index 2c49dc695..000000000
--- a/components/organisms/StripeCheckoutButton/stripe-checkout-button.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import Button, { ButtonsProps } from "components/shared/Button/button";
-
-import useSupabaseAuth from "lib/hooks/useSupabaseAuth";
-import { getStripe } from "lib/utils/stripe-client";
-
-interface StripeCheckoutButtonProps extends ButtonsProps {}
-
-const StripeCheckoutButton = ({ children, ...props }: StripeCheckoutButtonProps) => {
-  const { sessionToken } = useSupabaseAuth();
-
-  const handleFormSubmit = async (event: any) => {
-    event.preventDefault();
-
-    try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/auth/checkout/session`, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${sessionToken}`,
-        },
-      });
-
-      if (response.ok) {
-        const { sessionId } = await response.json();
-
-        const stripe = await getStripe();
-        stripe?.redirectToCheckout({ sessionId });
-      } else {
-        // display error to user
-        // eslint-disable-next-line no-console
-        console.error(response.statusText);
-      }
-    } catch (e) {
-      //
-    }
-  };
-
-  return (
-    <form onSubmit={handleFormSubmit}>
-      <Button {...props}>{children || "Upgrade Access"}</Button>
-    </form>
-  );
-};
-
-export default StripeCheckoutButton;
diff --git a/components/organisms/UserSettingsPage/user-settings-page.tsx b/components/organisms/UserSettingsPage/user-settings-page.tsx
index aae923507..a9421e2d1 100644
--- a/components/organisms/UserSettingsPage/user-settings-page.tsx
+++ b/components/organisms/UserSettingsPage/user-settings-page.tsx
@@ -337,7 +337,7 @@ const UserSettingsPage = ({ user }: UserSettingsPageProps) => {
               </span>
             </div>
 
-            <div id="upgrade" className="flex flex-col gap-2">
+            <div className="flex flex-col gap-2">
               <label className="flex flex-col w-full gap-2">
                 Time zone
                 <Select onValueChange={(value) => setTimezone(value)} value={timezone}>
diff --git a/interfaces/global-state-types.ts b/interfaces/global-state-types.ts
index 7fdccd6b3..3a7c82d82 100644
--- a/interfaces/global-state-types.ts
+++ b/interfaces/global-state-types.ts
@@ -8,7 +8,6 @@ export interface GlobalStateInterface {
   sessionToken?: string | null;
   providerToken?: string | null;
   userId?: number | null;
-  hasReports?: boolean;
   openSearch?: boolean;
   dismissFeaturedInsights?: boolean;
 }
diff --git a/layouts/hub-page.tsx b/layouts/hub-page.tsx
index dd09354a2..5f8c8aba3 100644
--- a/layouts/hub-page.tsx
+++ b/layouts/hub-page.tsx
@@ -16,12 +16,10 @@ const HubPageLayout = ({
   page = "dashboard",
   owners,
   children,
-  overLimit,
 }: {
   page?: string;
   owners?: string[];
   children: React.ReactNode;
-  overLimit?: boolean;
 }) => {
   const router = useRouter();
   const { userId } = useSupabaseAuth();
@@ -70,7 +68,6 @@ const HubPageLayout = ({
                 canEdit={canEdit}
                 workspaceId={workspaceId}
                 owners={owners}
-                overLimit={overLimit}
               />
             </ClientOnly>
           )}
diff --git a/layouts/lists.tsx b/layouts/lists.tsx
index a38a96d60..b8fce24bc 100644
--- a/layouts/lists.tsx
+++ b/layouts/lists.tsx
@@ -20,7 +20,6 @@ const ListPageLayout = ({
   repoFilter = false,
   repoFilterOptions = [],
   repoFilterSelect = () => {},
-  overLimit,
 }: {
   children: React.ReactNode;
   list?: DBList;
@@ -32,7 +31,6 @@ const ListPageLayout = ({
   repoFilter?: boolean;
   repoFilterOptions?: OptionKeys[];
   repoFilterSelect?: (repo: OptionKeys[]) => void;
-  overLimit?: boolean;
 }) => {
   const router = useRouter();
   const { range } = router.query;
@@ -58,7 +56,6 @@ const ListPageLayout = ({
               workspaceId={workspaceId}
               isOwner={isOwner}
               owners={owners}
-              overLimit={overLimit}
             />
           )}
         </Header>
diff --git a/lib/hooks/api/useIsWorkspaceUpgraded.ts b/lib/hooks/api/useIsWorkspaceUpgraded.ts
deleted file mode 100644
index 69f46d4b1..000000000
--- a/lib/hooks/api/useIsWorkspaceUpgraded.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import useSWR, { Fetcher } from "swr";
-import { publicApiFetcher } from "lib/utils/public-api-fetcher";
-
-export function useIsWorkspaceUpgraded({ workspaceId }: { workspaceId: string }) {
-  const { data, error, mutate } = useSWR<Workspace, Error>(
-    `workspaces/${workspaceId}`,
-    publicApiFetcher as Fetcher<Workspace, Error>
-  );
-
-  return { data: data?.exceeds_upgrade_limits === false, error };
-}
diff --git a/lib/hooks/useGetOrgRepos.ts b/lib/hooks/useGetOrgRepos.ts
index 98b4452af..d90a17031 100644
--- a/lib/hooks/useGetOrgRepos.ts
+++ b/lib/hooks/useGetOrgRepos.ts
@@ -2,7 +2,6 @@ import useSWR, { Fetcher } from "swr";
 import { useRouter } from "next/router";
 import { supabase } from "lib/utils/supabase";
 import { calcDaysFromToday } from "lib/utils/date-utils";
-import { useIsWorkspaceUpgraded } from "./api/useIsWorkspaceUpgraded";
 
 const baseUrl = "https://api.github.com";
 
@@ -32,13 +31,11 @@ const githubApiRepoFetcher: Fetcher = async (apiUrl: string) => {
     throw error;
   }
 
-  const requestUrl = new URL(apiUrl, baseUrl);
-  const upgraded = requestUrl.searchParams.get("upgraded");
   const linkHeader = res.headers.get("link");
 
   const responses = [res];
 
-  if (linkHeader && linkHeader.includes('rel="last"') && upgraded === "true") {
+  if (linkHeader && linkHeader.includes('rel="last"')) {
     // @ts-expect-error the regex group will exist as the link header is present as per https://docs.github.com/en/rest/using-the-rest-api/using-pagination-in-the-rest-api?apiVersion=2022-11-28#using-link-headers
     const groups = /page=(?<lastPage>\d+)>;\s+rel="last"/.exec(linkHeader).groups as { lastPage: string };
 
@@ -74,13 +71,11 @@ export const useGetOrgRepos = ({ organization, limit = 100 }: { organization: st
   const router = useRouter();
   const workspaceId = router.query.workspaceId as string;
   const range = router.query.range as string;
-  const { data: exceededLimit } = useIsWorkspaceUpgraded({ workspaceId });
   const query = new URLSearchParams();
   query.set("per_page", `${limit}`);
   query.set("type", "public");
   query.set("sort", "pushed");
   query.set("direction", "desc");
-  query.set("upgraded", !exceededLimit ? "true" : "false");
 
   const endpointString = organization ? `orgs/${organization}/repos?${query}` : null;
 
diff --git a/lib/hooks/useSession.ts b/lib/hooks/useSession.ts
index cf1b0982b..06a9a1a0d 100644
--- a/lib/hooks/useSession.ts
+++ b/lib/hooks/useSession.ts
@@ -6,7 +6,6 @@ import useSupabaseAuth from "./useSupabaseAuth";
 const useSession = (getSession = false) => {
   const { sessionToken } = useSupabaseAuth(getSession);
   const store = useStore();
-  const hasReports = useStore((state) => state.hasReports);
   const onboarded = useStore((state) => state.onboarded);
   const waitlisted = useStore((state) => state.waitlisted);
   const [session, setSession] = useState<false | DbUser>(false);
@@ -50,7 +49,6 @@ const useSession = (getSession = false) => {
   return {
     onboarded,
     waitlisted,
-    hasReports,
     session,
   };
 };
diff --git a/lib/hooks/useUserConnections.ts b/lib/hooks/useUserConnections.ts
index fc44122f5..a1d1cfcbd 100644
--- a/lib/hooks/useUserConnections.ts
+++ b/lib/hooks/useUserConnections.ts
@@ -34,17 +34,7 @@ const useUserConnections = () => {
       toast({ description: "Connection request Sent!", title: "Success", variant: "success" });
     } else {
       const response = await req?.json();
-      if (response.statusCode === 401) {
-        toast({
-          description: "You require upgraded access to use connections!",
-          title: "Not allowed",
-          variant: "danger",
-        });
-      } else {
-        toast({ description: response.message, title: "Error", variant: "danger" });
-      }
-      // eslint-disable-next-line no-console
-      console.log(response.message);
+      toast({ description: response.message, title: "Error", variant: "danger" });
     }
   }
 
diff --git a/lib/utils/stripe-client.ts b/lib/utils/stripe-client.ts
deleted file mode 100644
index 7e9cf868f..000000000
--- a/lib/utils/stripe-client.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { loadStripe, Stripe } from "@stripe/stripe-js";
-
-let stripePromise: Promise<Stripe | null>;
-
-export const getStripe = () => {
-  if (!stripePromise) {
-    stripePromise = loadStripe(
-      process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY_LIVE ?? process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY ?? ""
-    );
-  }
-
-  return stripePromise;
-};
diff --git a/lib/utils/workspace-utils.ts b/lib/utils/workspace-utils.ts
index c592b541e..051bb6c5b 100644
--- a/lib/utils/workspace-utils.ts
+++ b/lib/utils/workspace-utils.ts
@@ -78,17 +78,6 @@ export async function saveWorkspace({
   return { data: { workspace: data, repos: repoData, contributors: contributorsData }, error };
 }
 
-export async function upgradeWorkspace({ workspaceId, sessionToken }: { workspaceId: string; sessionToken: string }) {
-  const { data, error } = await fetchApiData<{ sessionId: string }>({
-    path: `auth/checkout/workspaces/${workspaceId}/session`,
-    method: "POST",
-    body: {},
-    bearerToken: sessionToken,
-  });
-
-  return { data, error };
-}
-
 export async function changeWorkspaceVisibility({
   workspaceId,
   sessionToken,
diff --git a/next-types.d.ts b/next-types.d.ts
index 6a121f23a..ae2f9249b 100644
--- a/next-types.d.ts
+++ b/next-types.d.ts
@@ -618,9 +618,7 @@ interface Workspace {
   updated_at: string | null;
   deleted_at: string | null;
   is_public: boolean;
-  payee_user_id: string | null;
   members: WorkspaceMember[];
-  exceeds_upgrade_limits: boolean;
 }
 
 interface WorkspaceMember {
diff --git a/package.json b/package.json
index 8c34a5b88..c8de32ffa 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,6 @@
     "@radix-ui/react-tooltip": "^1.0.3",
     "@react-spring/web": "^9.7.3",
     "@sentry/nextjs": "^7.80.0",
-    "@stripe/stripe-js": "^1.46.0",
     "@supabase/auth-helpers-nextjs": "^0.7.2",
     "@supabase/auth-helpers-react": "^0.4.0",
     "@supabase/gotrue-js": "^1.22.22",
@@ -115,7 +114,6 @@
     "remark-gfm": "^4.0.0",
     "rooks": "^7.4.4",
     "schema-dts": "^1.1.0",
-    "stripe": "^11.8.0",
     "swiper": "^10.2.0",
     "swr": "^2.0.3",
     "tailwindcss-animate": "^1.0.7",
diff --git a/pages/workspaces/[workspaceId]/activity.tsx b/pages/workspaces/[workspaceId]/activity.tsx
index f00c13d5e..ad217742b 100644
--- a/pages/workspaces/[workspaceId]/activity.tsx
+++ b/pages/workspaces/[workspaceId]/activity.tsx
@@ -1,7 +1,6 @@
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 import { GetServerSidePropsContext } from "next";
 import { useRouter } from "next/router";
-import dynamic from "next/dynamic";
 import { useState } from "react";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import { fetchApiData } from "helpers/fetchApiData";
@@ -18,7 +17,6 @@ import { OptionKeys } from "components/atoms/Select/multi-select";
 import { useGetWorkspaceRepositories } from "lib/hooks/api/useGetWorkspaceRepositories";
 import { setQueryParams } from "lib/utils/query-params";
 import ClientOnly from "components/atoms/ClientOnly/client-only";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import { SubTabsList } from "components/TabList/tab-list";
 import { StarSearchEmbed } from "components/StarSearch/StarSearchEmbed";
 import { useMediaQuery } from "lib/hooks/useMediaQuery";
@@ -27,10 +25,6 @@ import useSupabaseAuth from "lib/hooks/useSupabaseAuth";
 import { useWorkspaceMembers } from "lib/hooks/api/useWorkspaceMembers";
 import { OrderDirection } from "lib/utils/sorting";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"), {
-  ssr: false,
-});
-
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const supabase = createPagesServerClient(context);
   const {
@@ -59,17 +53,15 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   return {
     props: {
       workspace: data,
-      overLimit: !!data?.exceeds_upgrade_limits,
     },
   };
 };
 
 interface WorkspaceDashboardProps {
   workspace: Workspace;
-  overLimit: boolean;
 }
 
-const WorkspaceActivityPage = ({ workspace, overLimit }: WorkspaceDashboardProps) => {
+const WorkspaceActivityPage = ({ workspace }: WorkspaceDashboardProps) => {
   const { sessionToken, signIn, userId } = useSupabaseAuth();
   const {
     data: workspaceMembers = [],
@@ -115,20 +107,11 @@ const WorkspaceActivityPage = ({ workspace, overLimit }: WorkspaceDashboardProps
     repoIds,
   });
 
-  const showBanner = isOwner && overLimit;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
   const isMobile = useMediaQuery("(max-width: 768px)");
 
   return (
     <>
-      <WorkspaceLayout
-        workspaceId={workspace.id}
-        banner={
-          showBanner ? (
-            <WorkspaceBanner workspaceId={workspace.id} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-          ) : null
-        }
-      >
+      <WorkspaceLayout workspaceId={workspace.id}>
         <div className="px-4 py-8 lg:px-16 lg:py-12">
           <WorkspaceHeader workspace={workspace} />
           <div className="grid sm:flex gap-4 pt-3 border-b">
@@ -181,13 +164,6 @@ const WorkspaceActivityPage = ({ workspace, overLimit }: WorkspaceDashboardProps
           signInHandler={() => signIn({ provider: "github", options: { redirectTo: window.location.href } })}
         />
       </ClientOnly>
-      <InsightUpgradeModal
-        workspaceId={workspace.id}
-        variant="contributors"
-        isOpen={isInsightUpgradeModalOpen}
-        onClose={() => setIsInsightUpgradeModalOpen(false)}
-        overLimit={10}
-      />
     </>
   );
 };
diff --git a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/activity.tsx b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/activity.tsx
index 8a711ecf0..ec0c87f35 100644
--- a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/activity.tsx
+++ b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/activity.tsx
@@ -1,6 +1,5 @@
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 import { GetServerSidePropsContext } from "next";
-import dynamic from "next/dynamic";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import { NodeMouseEventHandler } from "@nivo/treemap";
@@ -20,12 +19,8 @@ import { FeatureFlagged } from "components/shared/feature-flagged";
 import { FeatureFlag, getAllFeatureFlags } from "lib/utils/server/feature-flags";
 import { OnToggleResizeEventType } from "components/Graphs/shared/graph-resizer";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import { OptionKeys } from "components/atoms/Select/multi-select";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 export interface ContributorListPageProps {
   list?: DBList;
   workspaceId: string;
@@ -249,9 +244,6 @@ const ListActivityPage = ({
   const treemapRef = useRef<HTMLSpanElement>(null);
   const mostActiveRef = useRef<HTMLSpanElement>(null);
   const graphResizerLookup = new Map();
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
 
   if (treemapRef.current) {
     graphResizerLookup.set(treemapRef.current, true);
@@ -277,14 +269,7 @@ const ListActivityPage = ({
   }, [projectData]);
 
   return (
-    <WorkspaceLayout
-      workspaceId={workspaceId}
-      banner={
-        showBanner ? (
-          <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-        ) : null
-      }
-    >
+    <WorkspaceLayout workspaceId={workspaceId}>
       <ListPageLayout
         list={list}
         workspaceId={workspaceId}
@@ -294,7 +279,6 @@ const ListActivityPage = ({
         repoFilter={true}
         repoFilterOptions={filterOptions}
         repoFilterSelect={setFilteredRepositories}
-        overLimit={showBanner}
       >
         {isError ? (
           <Error errorMessage="Unable to load list activity" />
@@ -326,13 +310,6 @@ const ListActivityPage = ({
           </div>
         )}
       </ListPageLayout>
-      <InsightUpgradeModal
-        workspaceId={workspaceId}
-        variant="all"
-        isOpen={isInsightUpgradeModalOpen}
-        onClose={() => setIsInsightUpgradeModalOpen(false)}
-        overLimit={numberOfContributors}
-      />
     </WorkspaceLayout>
   );
 };
diff --git a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/edit.tsx b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/edit.tsx
index b0cc5d3b7..c74e44585 100644
--- a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/edit.tsx
+++ b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/edit.tsx
@@ -14,11 +14,9 @@ import Title from "components/atoms/Typography/title";
 import TextInput from "components/atoms/TextInput/text-input";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import { TrackedContributorsTable } from "components/Workspaces/TrackedContributorsTable";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
 
 const TrackedContributorsModal = dynamic(import("components/Workspaces/TrackedContributorsModal"));
 const DeleteListPageModal = dynamic(import("components/organisms/ListPage/DeleteListPageModal"));
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
 
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const supabase = createPagesServerClient(context);
@@ -99,9 +97,6 @@ export default function ContributorInsightEditPage({
   const [trackedContributors, setTrackedContributors] = useState<Map<string, boolean>>(initialTrackedContributors);
   const [isTrackedContributorsModalOpen, setIsTrackedContributorsModalOpen] = useState(false);
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const overLimit = isOwner && !isWorkspaceUpgraded;
 
   const updateInsight = async () => {
     const { error: updateError } = await updateWorkspaceContributorInsight({
@@ -180,11 +175,6 @@ export default function ContributorInsightEditPage({
           disabled={loading}
           contributors={trackedContributors}
           onAddContributors={() => {
-            if (overLimit) {
-              setIsInsightUpgradeModalOpen(true);
-              return;
-            }
-
             setIsTrackedContributorsModalOpen(true);
           }}
           onRemoveTrackedContributor={(event) => {
@@ -251,15 +241,6 @@ export default function ContributorInsightEditPage({
         onConfirm={deleteInsight}
         onClose={() => setIsDeleteModalOpen(false)}
       />
-      {isOwner ? (
-        <InsightUpgradeModal
-          workspaceId={workspaceId}
-          variant="all"
-          isOpen={isInsightUpgradeModalOpen}
-          onClose={() => setIsInsightUpgradeModalOpen(false)}
-          overLimit={trackedContributors.size}
-        />
-      ) : null}
     </WorkspaceLayout>
   );
 }
diff --git a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/highlights.tsx b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/highlights.tsx
index 0c7c41d90..fe8c60eed 100644
--- a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/highlights.tsx
+++ b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/highlights.tsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 import { GetServerSidePropsContext } from "next";
-import dynamic from "next/dynamic";
 import { formatDistanceToNowStrict } from "date-fns";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -29,12 +28,8 @@ import Pagination from "components/molecules/Pagination/pagination";
 import Icon from "components/atoms/Icon/icon";
 import repoTofilterList from "lib/utils/repo-to-filter-list";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import { ContributorListPageProps } from "./activity";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 interface HighlightsPageProps extends ContributorListPageProps {
   highlights: PaginatedListContributorsHighlightsResponse;
 }
@@ -139,9 +134,6 @@ const Highlights = ({ list, workspaceId, numberOfContributors, isOwner, highligh
 
   const [contributor, setContributor] = useState("");
   const debouncedSearchTerm = useDebounceTerm(contributor, 300);
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
 
   const { data, isLoading, meta } = useFetchListContributorsHighlights({
     listId: list?.id ?? "",
@@ -163,14 +155,7 @@ const Highlights = ({ list, workspaceId, numberOfContributors, isOwner, highligh
   }, [debouncedSearchTerm]);
 
   return (
-    <WorkspaceLayout
-      workspaceId={workspaceId}
-      banner={
-        showBanner ? (
-          <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-        ) : null
-      }
-    >
+    <WorkspaceLayout workspaceId={workspaceId}>
       <ListPageLayout
         showRangeFilter={false}
         list={list}
@@ -178,7 +163,6 @@ const Highlights = ({ list, workspaceId, numberOfContributors, isOwner, highligh
         numberOfContributors={numberOfContributors}
         isOwner={isOwner}
         owners={owners}
-        overLimit={showBanner}
       >
         <div
           ref={topRef}
@@ -305,13 +289,6 @@ const Highlights = ({ list, workspaceId, numberOfContributors, isOwner, highligh
           </div>
         </div>
       </ListPageLayout>
-      <InsightUpgradeModal
-        workspaceId={workspaceId}
-        variant="contributors"
-        isOpen={isInsightUpgradeModalOpen}
-        onClose={() => setIsInsightUpgradeModalOpen(false)}
-        overLimit={numberOfContributors}
-      />
     </WorkspaceLayout>
   );
 };
diff --git a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/overview.tsx b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/overview.tsx
index e14febe9e..bbcba8ab9 100644
--- a/pages/workspaces/[workspaceId]/contributor-insights/[listId]/overview.tsx
+++ b/pages/workspaces/[workspaceId]/contributor-insights/[listId]/overview.tsx
@@ -1,5 +1,3 @@
-import dynamic from "next/dynamic";
-import { useState } from "react";
 import { useRouter } from "next/router";
 import { ErrorBoundary } from "react-error-boundary";
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
@@ -13,15 +11,11 @@ import { fetchApiData, validateListPath } from "helpers/fetchApiData";
 import ClientOnly from "components/atoms/ClientOnly/client-only";
 import { useContributorsList } from "lib/hooks/api/useContributorList";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import useSupabaseAuth from "lib/hooks/useSupabaseAuth";
 import ContributorsTable from "components/Tables/ContributorsTable";
 import { setQueryParams } from "lib/utils/query-params";
 import { OrderDirection } from "lib/utils/sorting";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 interface ListsOverviewProps {
   list: DBList;
   numberOfContributors: number;
@@ -161,19 +155,8 @@ const ListsOverview = ({
   const allContributorCommits = allContributorStats?.reduce((acc, curr) => acc + curr.commits, 0) || 0;
   const prevAllContributorCommits = prevAllContributorStats?.reduce((acc, curr) => acc + curr.commits, 0) || 0;
 
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
-
   return (
-    <WorkspaceLayout
-      workspaceId={workspaceId}
-      banner={
-        showBanner ? (
-          <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-        ) : null
-      }
-    >
+    <WorkspaceLayout workspaceId={workspaceId}>
       <ListPageLayout
         list={list}
         workspaceId={workspaceId}
@@ -181,7 +164,6 @@ const ListsOverview = ({
         isOwner={isOwner}
         showRangeFilter={false}
         owners={owners}
-        overLimit={showBanner}
       >
         <div className="flex flex-col w-full gap-4 px-4 py-8 lg:px-16 lg:py-12">
           <ClientOnly>
@@ -249,14 +231,6 @@ const ListsOverview = ({
           </ClientOnly>
         </div>
       </ListPageLayout>
-
-      <InsightUpgradeModal
-        workspaceId={workspaceId}
-        variant="contributors"
-        isOpen={isInsightUpgradeModalOpen}
-        onClose={() => setIsInsightUpgradeModalOpen(false)}
-        overLimit={numberOfContributors}
-      />
     </WorkspaceLayout>
   );
 };
diff --git a/pages/workspaces/[workspaceId]/index.tsx b/pages/workspaces/[workspaceId]/index.tsx
index bfe1941f5..636bd0c6b 100644
--- a/pages/workspaces/[workspaceId]/index.tsx
+++ b/pages/workspaces/[workspaceId]/index.tsx
@@ -24,7 +24,6 @@ import TrackedRepositoryFilter from "components/Workspaces/TrackedRepositoryFilt
 import { OptionKeys } from "components/atoms/Select/multi-select";
 import { WorkspaceOgImage, getWorkspaceOgImage } from "components/Workspaces/WorkspaceOgImage";
 import { useHasMounted } from "lib/hooks/useHasMounted";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import { StarSearchEmbed } from "components/StarSearch/StarSearchEmbed";
 import { useMediaQuery } from "lib/hooks/useMediaQuery";
 import { WORKSPACE_STARSEARCH_SUGGESTIONS } from "lib/utils/star-search";
@@ -33,7 +32,6 @@ import useSupabaseAuth from "lib/hooks/useSupabaseAuth";
 import { useWorkspaceMembers } from "lib/hooks/api/useWorkspaceMembers";
 
 const WorkspaceWelcomeModal = dynamic(() => import("components/Workspaces/WorkspaceWelcomeModal"));
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
 
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const supabase = createPagesServerClient(context);
@@ -75,7 +73,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   return {
     props: {
       workspace: data,
-      overLimit: !!data?.exceeds_upgrade_limits,
       ogImage: `${ogImage.href}`,
     },
   };
@@ -84,10 +81,9 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 interface WorkspaceDashboardProps {
   workspace: Workspace;
   ogImage: string;
-  overLimit: boolean;
 }
 
-const WorkspaceDashboard = ({ workspace, ogImage, overLimit }: WorkspaceDashboardProps) => {
+const WorkspaceDashboard = ({ workspace, ogImage }: WorkspaceDashboardProps) => {
   const { sessionToken, signIn, userId } = useSupabaseAuth();
   const {
     data: workspaceMembers = [],
@@ -124,9 +120,6 @@ const WorkspaceDashboard = ({ workspace, ogImage, overLimit }: WorkspaceDashboar
     filteredRepositories.length > 0 ? filteredRepositories.map((repo) => repo.label) : []
   );
 
-  const showBanner = isOwner && overLimit;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
-
   const isMobile = useMediaQuery("(max-width: 768px)");
 
   useEffect(() => {
@@ -144,25 +137,13 @@ const WorkspaceDashboard = ({ workspace, ogImage, overLimit }: WorkspaceDashboar
   return (
     <>
       {workspace.is_public ? <WorkspaceOgImage workspace={workspace} ogImage={ogImage} /> : null}
-      <WorkspaceLayout
-        workspaceId={workspace.id}
-        banner={
-          showBanner ? (
-            <WorkspaceBanner workspaceId={workspace.id} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-          ) : null
-        }
-      >
+      <WorkspaceLayout workspaceId={workspace.id}>
         <div className="px-4 py-8 lg:px-16 lg:py-12">
           <WorkspaceHeader workspace={workspace}>
             <Button
               variant="outline"
               className="my-auto gap-2 items-center shrink-0"
               onClick={() => {
-                if (overLimit) {
-                  setIsInsightUpgradeModalOpen(true);
-                  return;
-                }
-
                 router.push(`/workspaces/${workspace.id}/settings#load-wizard`);
               }}
             >
@@ -213,11 +194,6 @@ const WorkspaceDashboard = ({ workspace, ogImage, overLimit }: WorkspaceDashboar
                 <Card className="bg-transparent">
                   <EmptyState
                     onAddRepos={() => {
-                      if (overLimit) {
-                        setIsInsightUpgradeModalOpen(true);
-                        return;
-                      }
-
                       router.push(`/workspaces/${workspace.id}/settings#load-wizard`);
                     }}
                   />
@@ -246,13 +222,6 @@ const WorkspaceDashboard = ({ workspace, ogImage, overLimit }: WorkspaceDashboar
             setShowWelcome(false);
           }}
         />
-        <InsightUpgradeModal
-          workspaceId={workspace.id}
-          variant="contributors"
-          isOpen={isInsightUpgradeModalOpen}
-          onClose={() => setIsInsightUpgradeModalOpen(false)}
-          overLimit={10}
-        />
       </ClientOnly>
     </>
   );
diff --git a/pages/workspaces/[workspaceId]/issues.tsx b/pages/workspaces/[workspaceId]/issues.tsx
index fba59a6ad..b5ae800a9 100644
--- a/pages/workspaces/[workspaceId]/issues.tsx
+++ b/pages/workspaces/[workspaceId]/issues.tsx
@@ -1,7 +1,6 @@
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 import { GetServerSidePropsContext } from "next";
 import { useRouter } from "next/router";
-import dynamic from "next/dynamic";
 import { useState } from "react";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import { fetchApiData } from "helpers/fetchApiData";
@@ -16,7 +15,6 @@ import { OptionKeys } from "components/atoms/Select/multi-select";
 import { useGetWorkspaceRepositories } from "lib/hooks/api/useGetWorkspaceRepositories";
 import { setQueryParams } from "lib/utils/query-params";
 import ClientOnly from "components/atoms/ClientOnly/client-only";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import { OrderIssuesBy, useGetWorkspaceIssues } from "lib/hooks/api/useGetWorkspaceIssues";
 import { WorkspaceIssueTable } from "components/Workspaces/WorkspaceIssuesTable";
 import { SubTabsList } from "components/TabList/tab-list";
@@ -27,8 +25,6 @@ import { useWorkspaceMembers } from "lib/hooks/api/useWorkspaceMembers";
 import { WORKSPACE_STARSEARCH_SUGGESTIONS } from "lib/utils/star-search";
 import { OrderDirection } from "lib/utils/sorting";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const supabase = createPagesServerClient(context);
   const {
@@ -56,15 +52,14 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
 
   setCookie({ response: context.res, name: WORKSPACE_ID_COOKIE_NAME, value: workspaceId });
 
-  return { props: { workspace: data, overLimit: !!data?.exceeds_upgrade_limits } };
+  return { props: { workspace: data } };
 };
 
 interface WorkspaceDashboardProps {
   workspace: Workspace;
-  overLimit: boolean;
 }
 
-const WorkspaceIssuesPage = ({ workspace, overLimit }: WorkspaceDashboardProps) => {
+const WorkspaceIssuesPage = ({ workspace }: WorkspaceDashboardProps) => {
   const { sessionToken, signIn, userId } = useSupabaseAuth();
   const {
     data: workspaceMembers = [],
@@ -110,20 +105,11 @@ const WorkspaceIssuesPage = ({ workspace, overLimit }: WorkspaceDashboardProps)
     repoIds,
   });
 
-  const showBanner = isOwner && overLimit;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
   const isMobile = useMediaQuery("(max-width: 768px)");
 
   return (
     <>
-      <WorkspaceLayout
-        workspaceId={workspace.id}
-        banner={
-          showBanner ? (
-            <WorkspaceBanner workspaceId={workspace.id} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-          ) : null
-        }
-      >
+      <WorkspaceLayout workspaceId={workspace.id}>
         <div className="px-4 py-8 lg:px-16 lg:py-12">
           <WorkspaceHeader workspace={workspace} />
           <div className="grid sm:flex gap-4 pt-3">
@@ -160,13 +146,6 @@ const WorkspaceIssuesPage = ({ workspace, overLimit }: WorkspaceDashboardProps)
               <WorkspaceIssueTable isLoading={isLoading} data={issues} meta={meta} />
             </ClientOnly>
           </div>
-          <InsightUpgradeModal
-            workspaceId={workspace.id}
-            variant="contributors"
-            isOpen={isInsightUpgradeModalOpen}
-            onClose={() => setIsInsightUpgradeModalOpen(false)}
-            overLimit={10}
-          />
         </div>
       </WorkspaceLayout>
       <ClientOnly>
diff --git a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/activity.tsx b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/activity.tsx
index 870a3f85d..5e5881868 100644
--- a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/activity.tsx
+++ b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/activity.tsx
@@ -1,18 +1,12 @@
 import { GetServerSidePropsContext } from "next";
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 
-import { useState } from "react";
-import dynamic from "next/dynamic";
 import SEO from "layouts/SEO/SEO";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import HubPageLayout from "layouts/hub-page";
 import Activity from "components/organisms/Activity/activity";
 import { useHasMounted } from "lib/hooks/useHasMounted";
 import { fetchApiData } from "helpers/fetchApiData";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
-
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
 
 interface InsightPageProps {
   insight: DbUserInsight;
@@ -24,9 +18,6 @@ interface InsightPageProps {
 
 const HubPage = ({ insight, ogImage, workspaceId, owners, isOwner }: InsightPageProps) => {
   const repositories = insight.repos.map((repo) => repo.repo_id);
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
   const hasMounted = useHasMounted();
 
   if (!hasMounted) {
@@ -48,25 +39,11 @@ const HubPage = ({ insight, ogImage, workspaceId, owners, isOwner }: InsightPage
         image={ogImage}
         twitterCard="summary_large_image"
       />
-      <WorkspaceLayout
-        workspaceId={workspaceId}
-        banner={
-          showBanner ? (
-            <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-          ) : null
-        }
-      >
+      <WorkspaceLayout workspaceId={workspaceId}>
         <div className="px-4 py-8 lg:px-16 lg:py-12">
-          <HubPageLayout page="activity" owners={owners} overLimit={showBanner}>
+          <HubPageLayout page="activity" owners={owners}>
             <Activity repositories={repositories} />
           </HubPageLayout>
-          <InsightUpgradeModal
-            workspaceId={workspaceId}
-            variant="all"
-            isOpen={isInsightUpgradeModalOpen}
-            onClose={() => setIsInsightUpgradeModalOpen(false)}
-            overLimit={repositories.length}
-          />
         </div>
       </WorkspaceLayout>
     </>
diff --git a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/contributors.tsx b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/contributors.tsx
index 4c6f96fca..245a5acb7 100644
--- a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/contributors.tsx
+++ b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/contributors.tsx
@@ -2,16 +2,11 @@ import { useEffect, useState } from "react";
 import { GetServerSidePropsContext } from "next";
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 
-import dynamic from "next/dynamic";
 import SEO from "layouts/SEO/SEO";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import HubPageLayout from "layouts/hub-page";
 import Contributors from "components/organisms/Contributors/contributors";
 import { fetchApiData } from "helpers/fetchApiData";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
-
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
 
 interface InsightPageProps {
   insight: DbUserInsight;
@@ -24,9 +19,6 @@ interface InsightPageProps {
 const HubPage = ({ insight, ogImage, workspaceId, owners, isOwner }: InsightPageProps) => {
   const repositories = insight.repos.map((repo) => repo.repo_id);
   const [hydrated, setHydrated] = useState(false);
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
 
   useEffect(() => {
     setHydrated(true);
@@ -53,25 +45,11 @@ const HubPage = ({ insight, ogImage, workspaceId, owners, isOwner }: InsightPage
         image={ogImage}
         twitterCard="summary_large_image"
       />
-      <WorkspaceLayout
-        workspaceId={workspaceId}
-        banner={
-          showBanner ? (
-            <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-          ) : null
-        }
-      >
+      <WorkspaceLayout workspaceId={workspaceId}>
         <div className="px-4 py-8 lg:px-16 lg:py-12">
-          <HubPageLayout page="contributors" owners={owners} overLimit={showBanner}>
+          <HubPageLayout page="contributors" owners={owners}>
             <Contributors repositories={repositories} title={insight.name} />
           </HubPageLayout>
-          <InsightUpgradeModal
-            workspaceId={workspaceId}
-            variant="all"
-            isOpen={isInsightUpgradeModalOpen}
-            onClose={() => setIsInsightUpgradeModalOpen(false)}
-            overLimit={repositories.length}
-          />
         </div>
       </WorkspaceLayout>
     </>
diff --git a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/dashboard.tsx b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/dashboard.tsx
index fdb6f261c..4bef63d17 100644
--- a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/dashboard.tsx
+++ b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/dashboard.tsx
@@ -2,18 +2,13 @@ import { useEffect, useState } from "react";
 import { GetServerSidePropsContext } from "next";
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 
-import dynamic from "next/dynamic";
 import SEO from "layouts/SEO/SEO";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import HubPageLayout from "layouts/hub-page";
 import { fetchApiData } from "helpers/fetchApiData";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 import useSession from "lib/hooks/useSession";
 import Repositories from "components/organisms/Repositories/repositories";
 
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
-
 interface InsightPageProps {
   insight: DbUserInsight;
   isOwner: boolean;
@@ -27,10 +22,6 @@ const HubPage = ({ insight, isOwner, ogImage, workspaceId, owners }: InsightPage
   const [hydrated, setHydrated] = useState(false);
   const { session } = useSession(true);
 
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
-
   useEffect(() => {
     setHydrated(true);
   }, []);
@@ -56,28 +47,14 @@ const HubPage = ({ insight, isOwner, ogImage, workspaceId, owners }: InsightPage
         image={ogImage}
         twitterCard="summary_large_image"
       />
-      <WorkspaceLayout
-        workspaceId={workspaceId}
-        banner={
-          showBanner ? (
-            <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-          ) : null
-        }
-      >
+      <WorkspaceLayout workspaceId={workspaceId}>
         <div className="px-4 py-8 lg:px-16 lg:py-12">
-          <HubPageLayout page="dashboard" owners={owners} overLimit={showBanner}>
+          <HubPageLayout page="dashboard" owners={owners}>
             <Repositories
               repositories={repositories}
               personalWorkspaceId={isOwner ? undefined : (session as DbUser)?.personal_workspace_id}
             />
           </HubPageLayout>
-          <InsightUpgradeModal
-            workspaceId={workspaceId}
-            variant="all"
-            isOpen={isInsightUpgradeModalOpen}
-            onClose={() => setIsInsightUpgradeModalOpen(false)}
-            overLimit={repositories.length}
-          />
         </div>
       </WorkspaceLayout>
     </>
diff --git a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/edit.tsx b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/edit.tsx
index 5e9d7f7c0..f0aeee9b3 100644
--- a/pages/workspaces/[workspaceId]/repository-insights/[insightId]/edit.tsx
+++ b/pages/workspaces/[workspaceId]/repository-insights/[insightId]/edit.tsx
@@ -13,12 +13,9 @@ import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import { TrackedReposTable } from "components/Workspaces/TrackedReposTable";
 import Title from "components/atoms/Typography/title";
 import Text from "components/atoms/Typography/text";
-import { useIsWorkspaceUpgraded } from "lib/hooks/api/useIsWorkspaceUpgraded";
-import WorkspaceBanner from "components/Workspaces/WorkspaceBanner";
 
 const TrackedReposModal = dynamic(import("components/Workspaces/TrackedReposModal"));
 const DeleteInsightPageModal = dynamic(import("components/organisms/InsightPage/DeleteInsightPageModal"));
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
 
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const supabase = createPagesServerClient(context);
@@ -94,9 +91,6 @@ export default function RepoInsightEditPage({ insight, workspaceId, isOwner, bea
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const [trackedReposModalOpen, setTrackedReposModalOpen] = useState(false);
   const [trackedRepos, setTrackedRepos] = useState<Map<string, boolean>>(initialTrackedRepos);
-  const [isInsightUpgradeModalOpen, setIsInsightUpgradeModalOpen] = useState(false);
-  const { data: isWorkspaceUpgraded } = useIsWorkspaceUpgraded({ workspaceId });
-  const showBanner = isOwner && !isWorkspaceUpgraded;
 
   const updateInsight = async () => {
     setLoading(true);
@@ -143,11 +137,6 @@ export default function RepoInsightEditPage({ insight, workspaceId, isOwner, bea
   return (
     <WorkspaceLayout
       workspaceId={workspaceId}
-      banner={
-        showBanner ? (
-          <WorkspaceBanner workspaceId={workspaceId} openModal={() => setIsInsightUpgradeModalOpen(true)} />
-        ) : null
-      }
       footer={
         <Button
           variant="primary"
@@ -182,10 +171,6 @@ export default function RepoInsightEditPage({ insight, workspaceId, isOwner, bea
           disabled={loading}
           repositories={trackedRepos}
           onAddRepos={() => {
-            if (showBanner) {
-              setIsInsightUpgradeModalOpen(true);
-              return;
-            }
             setTrackedReposModalOpen(true);
           }}
           onRemoveTrackedRepo={(event) => {
@@ -256,15 +241,6 @@ export default function RepoInsightEditPage({ insight, workspaceId, isOwner, bea
           onConfirm={deleteInsight}
         />
       ) : null}
-      {isOwner ? (
-        <InsightUpgradeModal
-          workspaceId={workspaceId}
-          variant="all"
-          isOpen={isInsightUpgradeModalOpen}
-          onClose={() => setIsInsightUpgradeModalOpen(false)}
-          overLimit={trackedRepos.size}
-        />
-      ) : null}
     </WorkspaceLayout>
   );
 }
diff --git a/pages/workspaces/[workspaceId]/settings.tsx b/pages/workspaces/[workspaceId]/settings.tsx
index 57ed578ba..d89ca052d 100644
--- a/pages/workspaces/[workspaceId]/settings.tsx
+++ b/pages/workspaces/[workspaceId]/settings.tsx
@@ -1,11 +1,9 @@
-import { FaRegCheckCircle } from "react-icons/fa";
 import { useRouter } from "next/router";
 import { GetServerSidePropsContext } from "next";
 import { createPagesServerClient } from "@supabase/auth-helpers-nextjs";
 import { ComponentProps, useState } from "react";
 import dynamic from "next/dynamic";
 import { useEffectOnce } from "react-use";
-import { IoDiamond } from "react-icons/io5";
 import { WorkspaceLayout } from "components/Workspaces/WorkspaceLayout";
 import Button from "components/shared/Button/button";
 import TextInput from "components/atoms/TextInput/text-input";
@@ -21,27 +19,22 @@ import {
   deleteTrackedRepos,
   deleteWorkspace,
   saveWorkspace,
-  upgradeWorkspace,
 } from "lib/utils/workspace-utils";
 import { WORKSPACE_UPDATED_EVENT } from "components/shared/AppSidebar/AppSidebar";
 import { WorkspacesTabList } from "components/Workspaces/WorkspacesTabList";
 import { deleteCookie, setCookie } from "lib/utils/server/cookies";
 import WorkspaceVisibilityModal from "components/Workspaces/WorkspaceVisibilityModal";
-import Card from "components/atoms/Card/card";
 import { WorkspaceHeader } from "components/Workspaces/WorkspaceHeader";
-import { getStripe } from "lib/utils/stripe-client";
 import WorkspaceMembersConfig from "components/Workspaces/WorkspaceMembersConfig/workspace-members-config";
 import { useWorkspaceMembers } from "lib/hooks/api/useWorkspaceMembers";
 import ClientOnly from "components/atoms/ClientOnly/client-only";
 import { WORKSPACE_ID_COOKIE_NAME } from "lib/utils/caching";
 
 const DeleteWorkspaceModal = dynamic(() => import("components/Workspaces/DeleteWorkspaceModal"), { ssr: false });
-const InsightUpgradeModal = dynamic(() => import("components/Workspaces/InsightUpgradeModal"));
 
 interface WorkspaceSettingsProps {
   workspace: Workspace;
   canDeleteWorkspace: boolean;
-  overLimit: boolean;
 }
 
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
@@ -85,13 +78,12 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   return {
     props: {
       workspace: data,
-      overLimit: !!data.exceeds_upgrade_limits,
       canDeleteWorkspace: sessionData && workspaceId !== sessionData.personal_workspace_id,
     },
   };
 };
 
-const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: WorkspaceSettingsProps) => {
+const WorkspaceSettings = ({ workspace, canDeleteWorkspace }: WorkspaceSettingsProps) => {
   const { sessionToken } = useSupabaseAuth();
   const { toast } = useToast();
   const router = useRouter();
@@ -100,7 +92,6 @@ const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: Workspa
 
   const [isPublic, setIsPublic] = useState(workspace.is_public);
   const [isWorkspaceVisibilityModalOpen, setIsWorkspaceVisibilityModalOpen] = useState(false);
-  const [isWorkspaceUpgradeModalOpen, setIsWorkspaceUpgradeModalOpen] = useState(false);
 
   const [trackedReposModalOpen, setTrackedReposModalOpen] = useState(false);
   const {
@@ -188,18 +179,6 @@ const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: Workspa
     setIsSaving(false);
   };
 
-  const upgradeThisWorkspace = async () => {
-    const { data, error } = await upgradeWorkspace({ workspaceId: workspace.id, sessionToken: sessionToken! });
-    if (error) {
-      toast({ description: "There's been an error", variant: "danger" });
-    }
-
-    if (data) {
-      const stripe = await getStripe();
-      stripe?.redirectToCheckout({ sessionId: data.sessionId as string });
-    }
-  };
-
   const changeVisibility = async () => {
     const { data, error } = await changeWorkspaceVisibility({
       workspaceId: workspace.id,
@@ -262,11 +241,6 @@ const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: Workspa
             isLoading={isLoading}
             repositories={pendingTrackedRepos}
             onAddRepos={() => {
-              if (overLimit) {
-                setIsWorkspaceUpgradeModalOpen(true);
-                return;
-              }
-
               setTrackedReposModalOpen(true);
             }}
             onRemoveTrackedRepo={(event) => {
@@ -291,11 +265,6 @@ const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: Workspa
           <ClientOnly>
             <WorkspaceMembersConfig
               onAddMember={async (username) => {
-                if (overLimit) {
-                  setIsWorkspaceUpgradeModalOpen(true);
-                  return null;
-                }
-
                 return await addMember(workspace.id, sessionToken, username);
               }}
               onUpdateMember={async (memberId, role) => await updateMember(workspace.id, sessionToken, memberId, role)}
@@ -306,66 +275,12 @@ const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: Workspa
 
           <div className="flex flex-col py-8 gap-4">
             <h2 className="!font-medium">Change Workspace Visibility</h2>
-            <p className="text-sm text-slate-600">
-              This workspace is set to {isPublic ? "public" : "private"}.{" "}
-              {!workspace.payee_user_id && (
-                <span>
-                  Setting this to private is a <span className="font-bold">paid</span> feature. Upgrade your Workspace
-                  to unlock this feature.
-                </span>
-              )}
-            </p>
-
-            <Button
-              onClick={() => {
-                if (workspace.payee_user_id) {
-                  setIsWorkspaceVisibilityModalOpen(true);
-                } else {
-                  setIsWorkspaceUpgradeModalOpen(true);
-                }
-              }}
-              variant="primary"
-              className="w-fit"
-            >
+
+            <Button variant="primary" className="w-fit">
               Set to {isPublic ? "private" : "public"}
             </Button>
           </div>
 
-          {workspace.payee_user_id ? (
-            <section className="flex flex-col gap-4">
-              <div className="flex gap-4 items-center">
-                <h3 className="font-medium">Manage Subscription</h3>
-                <div className="flex gap-2 items-center text-white px-3 py-2 bg-gradient-to-l from-gradient-orange-one to-gradient-orange-two rounded-full">
-                  <p className="text-sm font-medium">PRO</p>
-                  <IoDiamond />
-                </div>
-              </div>
-              <p className="text-sm text-slate-600">
-                This Workspace is currently subscribed to the PRO Workspace plan.
-              </p>
-              <Button href={process.env.NEXT_PUBLIC_STRIPE_SUB_CANCEL_URL} variant="primary" className="w-fit">
-                Manage Subscription
-              </Button>
-            </section>
-          ) : (
-            <Card className="flex flex-col gap-4 px-6 pt-5 pb-6">
-              <h2 className="text-md font-medium">Upgrade your workspace</h2>
-              <div id="upgrade" className="flex gap-4">
-                <FaRegCheckCircle className="text-light-grass-8 w-6 h-6" />
-                <div className="flex flex-col gap-2">
-                  <h3 className="text-sm font-medium">Make your workspace private</h3>
-                  <p className="text-sm text-slate-500">
-                    While our free workspaces are exclusively public, upgrading to a Pro workspace gives you the power
-                    to choose between public or private settings for your projects.
-                  </p>
-                </div>
-              </div>
-              <Button variant="primary" className="w-fit mt-2" onClick={upgradeThisWorkspace}>
-                Upgrade Workspace
-              </Button>
-            </Card>
-          )}
-
           {canDeleteWorkspace && (
             <div className="flex flex-col p-6 rounded-2xl bg-light-slate-4">
               <Title className="!text-1xl !leading-none !border-light-slate-8 border-b pb-4" level={4}>
@@ -433,13 +348,6 @@ const WorkspaceSettings = ({ workspace, canDeleteWorkspace, overLimit }: Workspa
               }}
             />
           ) : null}
-
-          <InsightUpgradeModal
-            variant="all"
-            workspaceId={workspace.id}
-            isOpen={isWorkspaceUpgradeModalOpen}
-            onClose={() => setIsWorkspaceUpgradeModalOpen(false)}
-          />
         </div>
       </div>
     </WorkspaceLayout>