diff --git a/src/app/[...slug]/page.tsx b/src/app/[...slug]/page.tsx
index 4128dc0d5..ada2a241d 100644
--- a/src/app/[...slug]/page.tsx
+++ b/src/app/[...slug]/page.tsx
@@ -68,6 +68,7 @@ const PostLayout = ({params}: Props) => {
 			<TableOfContents
 				headings={post.headings}
 				rawMarkdown={post.body.raw}
+				editPath={post._id}
 			/>
 		</>
 	);
diff --git a/src/components/ContentTabs.jsx b/src/components/ContentTabs.jsx
deleted file mode 100644
index 81c2b0381..000000000
--- a/src/components/ContentTabs.jsx
+++ /dev/null
@@ -1,68 +0,0 @@
-'use client';
-
-import { useState, useEffect } from 'react';
-import { getMDXComponent } from 'next-contentlayer/hooks';
-import clsx from 'clsx';
-import { useParams, useRouter } from 'next/navigation';
-import { allPosts } from 'contentlayer/generated';
-import MdxComponents from '@/components/MdxComponents';
-
-export function ContentTabs({ children, name }) {
-  const params = useParams();
-  const router = useRouter();
-  const [onTab, setOnTab] = useState(true)
-  const [selectedTab, setSelectedTab] = useState(null);
-  const [postContent, setPostContent] = useState(null);
-
-  useEffect(() => {
-    updateTabFromURL();
-  }, []);
-
-  const updateTabFromURL = () => {
-
-    const path = `/${params.slug.join('/')}`;
-    const allPaths = children.map(child => child.props.href)
-
-    if (!allPaths.includes(path)) {
-      setSelectedTab(allPaths[0])
-      const selectedPost = allPosts.find(post => `/${post._raw.flattenedPath}` === allPaths[0] && name == 'main');
-
-      if (selectedPost) {
-        const Content = getMDXComponent(selectedPost.body.code);
-        setPostContent(<Content components={MdxComponents()} />);
-        setOnTab(false)
-        
-        const url = new URL(window.location.href);
-        url.pathname = allPaths[0];
-        window.history.replaceState(null, null, url.toString());
-        console.log('allPaths__', allPaths[0])
-      }
-    } else setSelectedTab(path)
-  };
-
-  if (!onTab) return <div>{postContent}</div>
-
-  return (
-    <div>
-      <div className="flex flex-wrap border-b overflow-auto">
-        {children.map((child, index) => (
-          <button
-            key={index}
-            className={clsx(
-              'py-2 px-3 mr-4 text-sm transition-colors duration-300 whitespace-nowrap',
-              selectedTab === child.props.href ? 'font-semibold border-b-2 border-[#3098AA] text-[#3098AA]' : 'hover:border-b-2 hover:border-gray-300 text-gray-500 dark:text-white'
-            )}
-            onClick={() => router.push(child.props.href)}
-          >
-            {child.props.title}
-          </button>
-        ))}
-      </div>
-      <div className="mt-4">{postContent}</div>
-    </div>
-  );
-}
-
-export function ContentTab({ title, href, selected }) {
-  return null;
-}
diff --git a/src/components/MdxComponents.tsx b/src/components/MdxComponents.tsx
index c7f2fed10..b898d58a0 100644
--- a/src/components/MdxComponents.tsx
+++ b/src/components/MdxComponents.tsx
@@ -1,5 +1,4 @@
 import AWSOneClickLaunchForm from './AWSOneClickLaunchForm';
-import {ContentTab, ContentTabs} from './ContentTabs';
 import FeatureParity from './FeatureParity';
 import Accordion from './mdx/Accordion';
 import {Callout} from './mdx/Callout';
@@ -23,8 +22,6 @@ const MdxComponents = (version?: string) => {
 		ResourceEstimator,
 		AWSOneClickLaunchForm,
 		Accordion,
-		ContentTabs: (props: any) => <ContentTabs {...props} />,
-		ContentTab: (props: any) => <ContentTab {...props} />,
 		Tabs: (props: any) => <Tabs {...props} />,
 		Tab: (props: any) => <Tab {...props} />,
 		QuickLinks,
diff --git a/src/components/Toc.tsx b/src/components/Toc.tsx
index b97adb983..9d037c197 100644
--- a/src/components/Toc.tsx
+++ b/src/components/Toc.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import clsx from 'clsx';
-import {allPosts} from 'contentlayer/generated';
 import Link from 'next/link';
 import {useParams} from 'next/navigation';
 import {useCallback, useEffect, useState} from 'react';
@@ -18,16 +17,16 @@ interface Heading {
 interface Props {
 	headings: Heading[];
 	rawMarkdown?: string;
+	/** Source file path under docs/, for the "Edit this page" link. */
+	editPath: string;
 }
 
 type ParamsType = {
-	version?: string;
 	slug: string[];
 };
 
-export function TableOfContents({headings, rawMarkdown}: Props) {
+export function TableOfContents({headings, rawMarkdown, editPath}: Props) {
 	let [currentSection, setCurrentSection] = useState(headings[0]?.id);
-	const [path, setPath] = useState('');
 	const [copied, setCopied] = useState(false);
 	const params: ParamsType = useParams();
 	const basePath = process.env.NEXT_PUBLIC_DOCS_BASE_PATH || '';
@@ -63,22 +62,6 @@ export function TableOfContents({headings, rawMarkdown}: Props) {
 			.filter((x): x is {id: string; top: number} => x !== null);
 	}, []);
 
-	useEffect(() => {
-		const path = params.slug.join('/');
-
-		if (allPosts) {
-			const post = allPosts.find(
-				post => post._raw.flattenedPath === path
-			);
-			if (post) {
-				let currentPath = post._id;
-				if (params?.version)
-					currentPath = `versioned/${params.version}/${currentPath}`;
-				setPath(currentPath);
-			}
-		}
-	}, [params]);
-
 	useEffect(() => {
 		if (headings.length === 0) return;
 
@@ -165,7 +148,7 @@ export function TableOfContents({headings, rawMarkdown}: Props) {
 						<hr className="mt-4" />
 						<div className="mt-4 flex items-center text-sm">
 							<a
-								href={`https://github.com/sourcegraph/docs/edit/main/docs/${path}`}
+								href={`https://github.com/sourcegraph/docs/edit/main/docs/${editPath}`}
 								target="_blank"
 								rel="noopener noreferrer"
 								className="flex items-center text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300"