diff --git a/apps/admin/src/comments/components/comment-menu.tsx b/apps/admin/src/comments/components/comment-menu.tsx
index 82362737a2b..15e8a0ea035 100644
--- a/apps/admin/src/comments/components/comment-menu.tsx
+++ b/apps/admin/src/comments/components/comment-menu.tsx
@@ -2,7 +2,6 @@ import {Button, DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMen
 import {type Comment, usePinComment, useUnpinComment} from '@tryghost/admin-x-framework/api/comments';
 import {DisableCommentingDialog} from './disable-commenting-dialog';
 import {LucideIcon} from '@tryghost/shade/utils';
-import {useCommentsPinningEnabled} from '@/comments/hooks/use-comments-pinning-enabled';
 import {useDisableMemberCommenting, useEnableMemberCommenting} from '@tryghost/admin-x-framework/api/members';
 import {useState} from 'react';
 
@@ -18,13 +17,12 @@ export function CommentMenu({
     const {mutate: pinComment} = usePinComment();
     const {mutate: unpinComment} = useUnpinComment();
     const [disableDialogOpen, setDisableDialogOpen] = useState(false);
-    const commentsPinningEnabled = useCommentsPinningEnabled();
 
     const {id: commentId, post, member} = comment;
     const postUrl = post?.url;
     const memberId = member?.id;
     const canComment = member?.can_comment;
-    const canPin = commentsPinningEnabled && !comment.parent_id && comment.status !== 'deleted';
+    const canPin = !comment.parent_id && comment.status !== 'deleted';
 
     const handleDisableCommenting = (hideComments: boolean) => {
         if (memberId) {
diff --git a/apps/admin/src/comments/components/comment-thread-list.tsx b/apps/admin/src/comments/components/comment-thread-list.tsx
index ab92caa62e6..7d816295070 100644
--- a/apps/admin/src/comments/components/comment-thread-list.tsx
+++ b/apps/admin/src/comments/components/comment-thread-list.tsx
@@ -8,7 +8,6 @@ import {CommentMetrics} from './comment-metrics';
 import {buildThreadLink} from './thread-link';
 import {Link, useSearchParams} from '@tryghost/admin-x-framework';
 import {LucideIcon, cn} from '@tryghost/shade/utils';
-import {useCommentsPinningEnabled} from '@/comments/hooks/use-comments-pinning-enabled';
 
 function RepliesLine({hasReplies}: {hasReplies: boolean}) {
     if (!hasReplies) {
@@ -36,7 +35,6 @@ function CommentRow({comment, dislikesEnabled, isReply = false, isSelectedCommen
     const {mutate: hideComment} = useHideComment();
     const {mutate: showComment} = useShowComment();
     const {mutate: unpinComment} = useUnpinComment();
-    const commentsPinningEnabled = useCommentsPinningEnabled();
 
     // Check replies array for loaded objects, or count.direct_replies for unloaded
     // TODO: remove count.replies fallback once backend is fully rolled out
@@ -64,10 +62,10 @@ function CommentRow({comment, dislikesEnabled, isReply = false, isSelectedCommen
                             canComment={comment.member?.can_comment}
                             createdAt={comment.created_at}
                             isHidden={comment.status === 'hidden'}
-                            isPinned={commentsPinningEnabled && comment.pinned}
+                            isPinned={comment.pinned}
                             memberId={comment.member?.id}
                             memberName={comment.member?.name}
-                            onUnpinClick={commentsPinningEnabled ? () => unpinComment({id: comment.id}) : undefined}
+                            onUnpinClick={() => unpinComment({id: comment.id})}
                         />
 
                         {comment.in_reply_to_snippet && isSelectedComment && (
diff --git a/apps/admin/src/comments/components/comments-list.tsx b/apps/admin/src/comments/components/comments-list.tsx
index b0480d6d1f5..d379320cf6d 100644
--- a/apps/admin/src/comments/components/comments-list.tsx
+++ b/apps/admin/src/comments/components/comments-list.tsx
@@ -10,7 +10,6 @@ import {Link, useSearchParams} from '@tryghost/admin-x-framework';
 import {LoadMoreButton, useInfiniteVirtualScroll, useScrollRestoration, useVirtualListWindow} from '@/shared/virtual-list';
 import {LucideIcon, cn} from '@tryghost/shade/utils';
 import {forwardRef, useEffect, useRef, useState} from 'react';
-import {useCommentsPinningEnabled} from '@/comments/hooks/use-comments-pinning-enabled';
 
 const SpacerRow = ({height}: { height: number }) => (
     <div aria-hidden="true" className="flex">
@@ -67,7 +66,6 @@ function CommentsList({
     const {mutate: hideComment} = useHideComment();
     const {mutate: showComment} = useShowComment();
     const {mutate: unpinComment} = useUnpinComment();
-    const commentsPinningEnabled = useCommentsPinningEnabled();
 
     const handleCloseSidebar = (open: boolean) => {
         setThreadSidebarOpen(open);
@@ -157,13 +155,13 @@ function CommentsList({
                                                     canComment={item.member?.can_comment}
                                                     createdAt={item.created_at}
                                                     isHidden={item.status === 'hidden'}
-                                                    isPinned={commentsPinningEnabled && item.pinned}
+                                                    isPinned={item.pinned}
                                                     memberId={item.member?.id}
                                                     memberName={item.member?.name}
                                                     postTitle={item.post?.title}
                                                     onAuthorClick={item.member?.id ? () => onAddFilter('author', item.member!.id) : undefined}
                                                     onPostClick={item.post?.id ? () => onAddFilter('post', item.post!.id) : undefined}
-                                                    onUnpinClick={commentsPinningEnabled ? () => unpinComment({id: item.id}) : undefined}
+                                                    onUnpinClick={() => unpinComment({id: item.id})}
                                                 />
 
                                                 {item.in_reply_to_snippet && (
diff --git a/apps/admin/src/comments/hooks/use-comments-pinning-enabled.ts b/apps/admin/src/comments/hooks/use-comments-pinning-enabled.ts
deleted file mode 100644
index 7fee5612dd1..00000000000
--- a/apps/admin/src/comments/hooks/use-comments-pinning-enabled.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {useFeatureFlag} from '@tryghost/admin-x-framework/hooks';
-
-/**
- * Returns true when the `commentsPinning` private labs flag is enabled.
- *
- * Reads the config query so it works on routes that don't mount
- * PostAnalyticsProvider (e.g. the site-wide /ghost#/comments view).
- */
-export const useCommentsPinningEnabled = (): boolean => {
-    return useFeatureFlag('commentsPinning');
-};
diff --git a/apps/comments-ui/package.json b/apps/comments-ui/package.json
index 9eb26dea357..019ddb31eb4 100644
--- a/apps/comments-ui/package.json
+++ b/apps/comments-ui/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@tryghost/comments-ui",
     "type": "module",
-    "version": "1.5.22",
+    "version": "1.6.0",
     "license": "MIT",
     "repository": "https://github.com/TryGhost/Ghost",
     "author": "Ghost Foundation",
diff --git a/apps/comments-ui/src/components/content/comment.tsx b/apps/comments-ui/src/components/content/comment.tsx
index 30d5e32e631..1ee9dc12d0e 100644
--- a/apps/comments-ui/src/components/content/comment.tsx
+++ b/apps/comments-ui/src/components/content/comment.tsx
@@ -11,7 +11,7 @@ import ThreadedReplies from './threaded-replies';
 import {Avatar, BlankAvatar} from './avatar';
 import {Comment, OpenCommentForm, useAppContext} from '../../app-context';
 import {Transition} from '@headlessui/react';
-import {buildCommentPermalink, findCommentById, formatExplicitTime, getCommentInReplyToSnippet, getMemberNameFromComment} from '../../utils/helpers';
+import {buildCommentPermalink, formatExplicitTime, getCommentInReplyToSnippet, getMemberNameFromComment} from '../../utils/helpers';
 import {useRelativeTime} from '../../utils/hooks';
 
 type CommentLayoutVariant = 'root' | 'reply';
@@ -19,12 +19,11 @@ type CommentLayoutVariant = 'root' | 'reply';
 type AnimatedCommentProps = {
     comment: Comment;
     parent?: Comment;
-    useThreading?: boolean;
     layoutVariant?: CommentLayoutVariant;
     isLastSibling?: boolean;
 };
 
-const AnimatedComment: React.FC<React.PropsWithChildren<AnimatedCommentProps>> = ({children, comment, parent, useThreading, layoutVariant, isLastSibling}) => {
+const AnimatedComment: React.FC<React.PropsWithChildren<AnimatedCommentProps>> = ({children, comment, parent, layoutVariant, isLastSibling}) => {
     const {commentsIsLoading} = useAppContext();
 
     return (
@@ -40,14 +39,14 @@ const AnimatedComment: React.FC<React.PropsWithChildren<AnimatedCommentProps>> =
             show={true}
             appear
         >
-            <CommentComponent comment={comment} isLastSibling={isLastSibling} layoutVariant={layoutVariant} parent={parent} useThreading={useThreading}>
+            <CommentComponent comment={comment} isLastSibling={isLastSibling} layoutVariant={layoutVariant} parent={parent}>
                 {children}
             </CommentComponent>
         </Transition>
     );
 };
 
-export const CommentComponent: React.FC<CommentProps> = ({children, comment, parent, useThreading = false, layoutVariant = 'root', isLastSibling = false}) => {
+export const CommentComponent: React.FC<CommentProps> = ({children, comment, parent, layoutVariant = 'root', isLastSibling = false}) => {
     const {dispatchAction, isAdmin} = useAppContext();
     const hasNestedReplies = React.Children.count(children) > 0;
     const {showDeletedMessage, showHiddenMessage, showCommentContent} = useCommentVisibility(comment, isAdmin, hasNestedReplies);
@@ -64,9 +63,9 @@ export const CommentComponent: React.FC<CommentProps> = ({children, comment, par
     }, [comment.id, dispatchAction]);
 
     if (showDeletedMessage || showHiddenMessage) {
-        return <UnpublishedComment comment={comment} isLastSibling={isLastSibling} layoutVariant={layoutVariant} openEditMode={openEditMode} parent={parent} useThreading={useThreading}>{children}</UnpublishedComment>;
+        return <UnpublishedComment comment={comment} isLastSibling={isLastSibling} layoutVariant={layoutVariant} openEditMode={openEditMode} parent={parent}>{children}</UnpublishedComment>;
     } else if (showCommentContent && !showHiddenMessage) {
-        return <PublishedComment comment={comment} isLastSibling={isLastSibling} layoutVariant={layoutVariant} openEditMode={openEditMode} parent={parent} useThreading={useThreading}>{children}</PublishedComment>;
+        return <PublishedComment comment={comment} isLastSibling={isLastSibling} layoutVariant={layoutVariant} openEditMode={openEditMode} parent={parent}>{children}</PublishedComment>;
     }
 
     return null;
@@ -74,21 +73,9 @@ export const CommentComponent: React.FC<CommentProps> = ({children, comment, par
 
 type CommentProps = React.PropsWithChildren<AnimatedCommentProps>;
 
-const getReplyFormState = (comment: Comment, openCommentForms: OpenCommentForm[], useThreading: boolean) => {
-    // Non-threaded replies to replies are displayed inside the top-level comment,
-    // so match either the comment id or parent id. Threaded replies render their
-    // own reply form inline, so only match the current comment.
-    const activeReplyForm = useThreading
-        ? openCommentForms.find(f => f.id === comment.id && f.type === 'reply')
-        : openCommentForms.find(f => (f.id === comment.id || f.parent_id === comment.id) && f.type === 'reply');
-    const visibleReplyForm = activeReplyForm && (useThreading || !activeReplyForm.parent_id || activeReplyForm.parent_id === comment.id)
-        ? activeReplyForm
-        : undefined;
-
-    return {
-        activeReplyForm,
-        visibleReplyForm
-    };
+// Threaded replies render their own reply form inline, so only match the current comment
+const getActiveReplyForm = (comment: Comment, openCommentForms: OpenCommentForm[]) => {
+    return openCommentForms.find(f => f.id === comment.id && f.type === 'reply');
 };
 
 const useCommentVisibility = (comment: Comment, admin: boolean, hasNestedReplies?: boolean) => {
@@ -108,9 +95,8 @@ const useCommentVisibility = (comment: Comment, admin: boolean, hasNestedReplies
 
 type PublishedCommentProps = CommentProps & {
     openEditMode: () => void;
-    useThreading: boolean;
 }
-const PublishedComment: React.FC<PublishedCommentProps> = ({children, comment, parent, openEditMode, useThreading, layoutVariant = 'root', isLastSibling = false}) => {
+const PublishedComment: React.FC<PublishedCommentProps> = ({children, comment, parent, openEditMode, layoutVariant = 'root', isLastSibling = false}) => {
     const {dispatchAction, openCommentForms, isAdmin, commentIdToHighlight, commentIdFromHash} = useAppContext();
     const hasNestedReplies = React.Children.count(children) > 0;
 
@@ -122,7 +108,7 @@ const PublishedComment: React.FC<PublishedCommentProps> = ({children, comment, p
     const editForm = openCommentForms.find(openForm => openForm.id === comment.id && openForm.type === 'edit');
     const isInEditMode = !!editForm;
 
-    const {activeReplyForm, visibleReplyForm} = getReplyFormState(comment, openCommentForms, useThreading);
+    const activeReplyForm = getActiveReplyForm(comment, openCommentForms);
     // only highlight the reply button for the comment that is being replied to
     const highlightReplyButton = !!(activeReplyForm && activeReplyForm.id === comment.id);
 
@@ -150,7 +136,7 @@ const PublishedComment: React.FC<PublishedCommentProps> = ({children, comment, p
     }, [comment, parent, activeReplyForm, dispatchAction]);
 
     const hasChildReplies = hasNestedReplies || (comment.replies && comment.replies.length > 0);
-    const hasReplies = !!visibleReplyForm || hasChildReplies;
+    const hasReplies = !!activeReplyForm || hasChildReplies;
     const avatar = (<Avatar member={comment.member} />);
     const replyFormParent = parent || comment;
     const isHighlighted = commentIdFromHash
@@ -162,22 +148,20 @@ const PublishedComment: React.FC<PublishedCommentProps> = ({children, comment, p
             className={hiddenClass}
             hasReplies={hasReplies}
             isLastSibling={isLastSibling}
-            isPinned={comment.pinned}
             layoutVariant={layoutVariant}
             memberUuid={comment.member?.uuid}
-            replies={<RepliesContainer comment={comment} parent={parent} useThreading={useThreading}>{children}</RepliesContainer>}
-            replyForm={visibleReplyForm ? <ReplyFormBox continueLine={hasChildReplies} openForm={visibleReplyForm} parent={replyFormParent} useThreading={useThreading} /> : null}
-            useThreading={useThreading}
+            replies={<RepliesContainer comment={comment} parent={parent}>{children}</RepliesContainer>}
+            replyForm={activeReplyForm ? <ReplyFormBox continueLine={hasChildReplies} openForm={activeReplyForm} parent={replyFormParent} /> : null}
         >
             <div id={comment.id}>
                 {isInEditMode ? (
                     <>
-                        <CommentHeader className={hiddenClass} comment={comment} useThreading={useThreading} />
+                        <CommentHeader className={hiddenClass} comment={comment} />
                         <EditForm comment={comment} openForm={editForm} parent={parent} />
                     </>
                 ) : (
                     <>
-                        <CommentHeader className={hiddenClass} comment={comment} useThreading={useThreading} />
+                        <CommentHeader className={hiddenClass} comment={comment} />
                         <CommentBody className={hiddenClass} html={comment.html} isHighlighted={isHighlighted} />
                         <CommentMenu
                             comment={comment}
@@ -196,11 +180,10 @@ type UnpublishedCommentProps = {
     comment: Comment;
     openEditMode: () => void;
     parent?: Comment;
-    useThreading: boolean;
     layoutVariant?: CommentLayoutVariant;
     isLastSibling?: boolean;
 }
-const UnpublishedComment: React.FC<React.PropsWithChildren<UnpublishedCommentProps>> = ({children, comment, openEditMode, parent, useThreading, layoutVariant = 'root', isLastSibling = false}) => {
+const UnpublishedComment: React.FC<React.PropsWithChildren<UnpublishedCommentProps>> = ({children, comment, openEditMode, parent, layoutVariant = 'root', isLastSibling = false}) => {
     const {isAdmin, openCommentForms, t} = useAppContext();
     const hasNestedReplies = React.Children.count(children) > 0;
 
@@ -213,9 +196,9 @@ const UnpublishedComment: React.FC<React.PropsWithChildren<UnpublishedCommentPro
             t('This comment has been removed.') :
             '';
 
-    const {visibleReplyForm} = getReplyFormState(comment, openCommentForms, useThreading);
+    const activeReplyForm = getActiveReplyForm(comment, openCommentForms);
     const hasChildReplies = hasNestedReplies || (comment.replies && comment.replies.length > 0);
-    const hasReplies = !!visibleReplyForm || hasChildReplies;
+    const hasReplies = !!activeReplyForm || hasChildReplies;
 
     // Only show MoreButton for hidden (not deleted) comments when admin
     const showMoreButton = isAdmin && comment.status === 'hidden';
@@ -227,11 +210,9 @@ const UnpublishedComment: React.FC<React.PropsWithChildren<UnpublishedCommentPro
             avatar={avatar}
             hasReplies={hasReplies}
             isLastSibling={isLastSibling}
-            isPinned={comment.pinned}
             layoutVariant={layoutVariant}
-            replies={<RepliesContainer comment={comment} parent={parent} useThreading={useThreading}>{children}</RepliesContainer>}
-            replyForm={visibleReplyForm ? <ReplyFormBox continueLine={hasChildReplies} openForm={visibleReplyForm} parent={replyFormParent} useThreading={useThreading} /> : null}
-            useThreading={useThreading}
+            replies={<RepliesContainer comment={comment} parent={parent}>{children}</RepliesContainer>}
+            replyForm={activeReplyForm ? <ReplyFormBox continueLine={hasChildReplies} openForm={activeReplyForm} parent={replyFormParent} /> : null}
         >
             <div className="mt-[-3px] flex items-start" id={comment.id}>
                 <div className="flex h-10 flex-row items-center gap-4 pb-[8px] pr-4">
@@ -277,18 +258,17 @@ const EditedInfo: React.FC<{comment: Comment}> = ({comment}) => {
     );
 };
 
-const RepliesContainer: React.FC<React.PropsWithChildren<RepliesProps & {className?: string; parent?: Comment; useThreading?: boolean}>> = ({children, comment, className = '', parent, useThreading = false}) => {
+const RepliesContainer: React.FC<React.PropsWithChildren<RepliesProps & {className?: string; parent?: Comment}>> = ({children, comment, className = '', parent}) => {
     const hasNestedReplies = React.Children.count(children) > 0;
     const hasReplies = hasNestedReplies || (comment.replies && comment.replies.length > 0);
-    const shouldRenderThreadedReplies = useThreading && !parent;
 
     if (!hasReplies) {
         return null;
     }
 
     return (
-        <div className={`${useThreading ? 'ml-8 flow-root sm:ml-9' : '-ml-2 mb-4 mt-7 sm:mb-0 sm:mt-8'} ${className}`}>
-            {hasNestedReplies ? children : shouldRenderThreadedReplies ? <ThreadedReplies comment={comment} useThreading={useThreading} /> : <Replies comment={comment} useThreading={useThreading} />}
+        <div className={`ml-8 flow-root sm:ml-9 ${className}`}>
+            {hasNestedReplies ? children : !parent ? <ThreadedReplies comment={comment} /> : <Replies comment={comment} />}
         </div>
     );
 };
@@ -296,18 +276,9 @@ const RepliesContainer: React.FC<React.PropsWithChildren<RepliesProps & {classNa
 type ReplyFormBoxProps = {
     openForm: OpenCommentForm;
     parent: Comment;
-    useThreading: boolean;
     continueLine?: boolean;
 };
-const ReplyFormBox: React.FC<ReplyFormBoxProps> = ({openForm, parent, useThreading, continueLine = false}) => {
-    if (!useThreading) {
-        return (
-            <div className="my-8 sm:my-10">
-                <ReplyForm openForm={openForm} parent={parent} />
-            </div>
-        );
-    }
-
+const ReplyFormBox: React.FC<ReplyFormBoxProps> = ({openForm, parent, continueLine = false}) => {
     const spacingClass = continueLine ? 'pb-8 sm:pb-10' : 'mb-8 sm:mb-10';
 
     return (
@@ -324,7 +295,7 @@ const ReplyFormBox: React.FC<ReplyFormBoxProps> = ({openForm, parent, useThreadi
                 data-testid="reply-form-elbow"
                 aria-hidden
             />
-            <ReplyForm openForm={openForm} parent={parent} threadedLayout={true} />
+            <ReplyForm openForm={openForm} parent={parent} />
         </div>
     );
 };
@@ -343,41 +314,15 @@ const AuthorName: React.FC<{comment: Comment}> = ({comment}) => {
     );
 };
 
-export const RepliedToSnippet: React.FC<{comment: Comment}> = ({comment}) => {
-    const {comments, t} = useAppContext();
-    const inReplyToComment = findCommentById(comments, comment.in_reply_to_id);
-
-    let inReplyToSnippet = comment.in_reply_to_snippet;
-    // For public API requests hidden/deleted comments won't exist in the comments array
-    // unless it was only just deleted in which case it will exist but have a 'deleted' status
-    if (!inReplyToComment || inReplyToComment.status !== 'published') {
-        inReplyToSnippet = `[${t('removed')}]`;
-    }
-
-    const linkToReply = inReplyToComment && inReplyToComment.status === 'published';
-    const className = 'font-medium text-neutral-900/60 break-all transition-colors dark:text-white/70';
-    const linkClassName = `${className} hover:text-neutral-900/75 dark:hover:text-white/85`;
-
-    if (!linkToReply) {
-        return <span className={className} data-testid="comment-in-reply-to">{inReplyToSnippet}</span>;
-    }
-
-    return (
-        <a className={linkClassName} data-testid="comment-in-reply-to" href={buildCommentPermalink(comment.in_reply_to_id)} target="_parent">{inReplyToSnippet}</a>
-    );
-};
-
 type CommentHeaderProps = {
     comment: Comment;
     className?: string;
-    useThreading: boolean;
 }
 
-const CommentHeader: React.FC<CommentHeaderProps> = ({comment, className = '', useThreading}) => {
-    const {member, t} = useAppContext();
+const CommentHeader: React.FC<CommentHeaderProps> = ({comment, className = ''}) => {
+    const {member} = useAppContext();
     const createdAtRelative = useRelativeTime(comment.created_at);
     const memberExpertise = member && comment.member && comment.member.uuid === member.uuid ? member.expertise : comment?.member?.expertise;
-    const showReplyContext = !useThreading && comment.in_reply_to_id && comment.in_reply_to_snippet;
 
     const timestampElement = (
         <a
@@ -391,28 +336,21 @@ const CommentHeader: React.FC<CommentHeaderProps> = ({comment, className = '', u
     );
 
     return (
-        <>
-            <div className={`mt-0.5 flex flex-wrap items-start sm:flex-row ${memberExpertise ? 'flex-col' : 'flex-row'} ${showReplyContext ? 'mb-0.5' : 'mb-2'} ${className}`}>
-                <AuthorName comment={comment} />
-                <div className="flex items-baseline pr-4 font-sans text-base leading-snug text-neutral-900/50 dark:text-white/60 sm:text-sm">
-                    <span>
-                        <MemberExpertise comment={comment}/>
-                        {timestampElement}
-                        {comment.pinned && (
-                            <span className="ml-2 inline-flex align-middle">
-                                <PinnedLabel comment={comment} />
-                            </span>
-                        )}
-                        <EditedInfo comment={comment} />
-                    </span>
-                </div>
+        <div className={`mb-2 mt-0.5 flex flex-wrap items-start sm:flex-row ${memberExpertise ? 'flex-col' : 'flex-row'} ${className}`}>
+            <AuthorName comment={comment} />
+            <div className="flex items-baseline pr-4 font-sans text-base leading-snug text-neutral-900/50 dark:text-white/60 sm:text-sm">
+                <span>
+                    <MemberExpertise comment={comment}/>
+                    {timestampElement}
+                    {comment.pinned && (
+                        <span className="ml-2 inline-flex align-middle">
+                            <PinnedLabel comment={comment} />
+                        </span>
+                    )}
+                    <EditedInfo comment={comment} />
+                </span>
             </div>
-            {(showReplyContext &&
-                <div className="mb-2 line-clamp-1 font-sans text-base leading-snug text-neutral-900/50 dark:text-white/60 sm:text-sm">
-                    <span>{t('Replied to')}</span>:&nbsp;<RepliedToSnippet comment={comment} />
-                </div>
-            )}
-        </>
+        </div>
     );
 };
 
@@ -507,15 +445,11 @@ const CommentMenu: React.FC<CommentMenuProps> = ({comment, openReplyForm, highli
 // -- Layout --
 //
 
-const RepliesLine: React.FC<{hasReplies: boolean; useThreading: boolean}> = ({hasReplies, useThreading}) => {
+const RepliesLine: React.FC<{hasReplies: boolean}> = ({hasReplies}) => {
     if (!hasReplies) {
         return null;
     }
 
-    if (!useThreading) {
-        return (<div className="mb-2 h-full w-px grow rounded bg-gradient-to-b from-neutral-900/15 from-70% to-transparent dark:from-white/20 dark:from-70%" data-testid="replies-line" />);
-    }
-
     return (<div className="ml-4 h-full grow self-start border-l border-neutral-300 dark:border-neutral-700" data-testid="replies-line" />);
 };
 
@@ -526,39 +460,14 @@ type CommentLayoutProps = {
     className?: string;
     memberUuid?: string;
     isLastSibling?: boolean;
-    isPinned?: boolean;
     layoutVariant?: CommentLayoutVariant;
     replies?: React.ReactNode;
     replyForm?: React.ReactNode;
-    useThreading: boolean;
 }
 
-const COMMENT_GAP_CLASS_NAME = 'mb-7';
-const PINNED_COMMENT_GAP_CLASS_NAME = 'mb-4';
-const PINNED_COMMENT_BOX_CLASS_NAME = 'bg-amber-50/70 px-3 py-3 dark:bg-amber-400/10';
-
-const CommentLayout: React.FC<CommentLayoutProps> = ({children, avatar, hasReplies, className = '', memberUuid = '', isLastSibling = false, isPinned = false, layoutVariant = 'root', replies, replyForm, useThreading}) => {
+const CommentLayout: React.FC<CommentLayoutProps> = ({children, avatar, hasReplies, className = '', memberUuid = '', isLastSibling = false, layoutVariant = 'root', replies, replyForm}) => {
     const isReplyLayout = layoutVariant === 'reply';
 
-    if (!useThreading) {
-        const bottomMarginClassName = isPinned ? PINNED_COMMENT_GAP_CLASS_NAME : hasReplies ? 'mb-0' : COMMENT_GAP_CLASS_NAME;
-        return (
-            <div className={`flex w-full flex-row rounded-lg ${isPinned ? PINNED_COMMENT_BOX_CLASS_NAME : ''} ${bottomMarginClassName}`} data-member-uuid={memberUuid} data-pinned={isPinned ? 'true' : undefined} data-testid="comment-component">
-                <div className="mr-2 flex flex-col items-center justify-start sm:mr-3">
-                    <div className={`flex-0 mb-3 sm:mb-4 ${className}`}>
-                        {avatar}
-                    </div>
-                    <RepliesLine hasReplies={hasReplies} useThreading={useThreading} />
-                </div>
-                <div className="grow">
-                    {children}
-                    {hasReplies && replies}
-                    {replyForm}
-                </div>
-            </div>
-        );
-    }
-
     return (
         <div className={`relative flow-root ${hasReplies ? 'pb-4 sm:pb-0' : 'pb-7'}`}>
             {isReplyLayout && !isLastSibling && (
@@ -578,7 +487,7 @@ const CommentLayout: React.FC<CommentLayoutProps> = ({children, avatar, hasRepli
                     <div className={`flex-0 mb-1 ${className}`}>
                         {avatar}
                     </div>
-                    <RepliesLine hasReplies={hasReplies} useThreading={useThreading} />
+                    <RepliesLine hasReplies={hasReplies} />
                 </div>
                 <div className={`grow ${hasReplies ? 'pb-7 sm:pb-8' : ''}`}>
                     {children}
diff --git a/apps/comments-ui/src/components/content/content.tsx b/apps/comments-ui/src/components/content/content.tsx
index 5e9e8f22c05..0265171e904 100644
--- a/apps/comments-ui/src/components/content/content.tsx
+++ b/apps/comments-ui/src/components/content/content.tsx
@@ -56,17 +56,16 @@ const Content = () => {
     const showMainForm = canComment;
     const showDisabledBox = !canComment && isCommentingDisabled;
     const showCtaBox = !canComment && !isCommentingDisabled;
-    const useThreading = !!labs.commentsThreads;
     const focusedThread = useMemo(() => (
-        useThreading ? getFocusedThread(comments, commentIdFromHash, maxThreadDepth) : null
-    ), [comments, commentIdFromHash, maxThreadDepth, useThreading]);
+        getFocusedThread(comments, commentIdFromHash, maxThreadDepth)
+    ), [comments, commentIdFromHash, maxThreadDepth]);
 
     const navActions = useCommentNavigation({
         containerRef,
         focusedThread
     });
 
-    const commentsComponents = comments.map(comment => <Comment key={comment.id} comment={comment} useThreading={useThreading} />);
+    const commentsComponents = comments.map(comment => <Comment key={comment.id} comment={comment} />);
 
     const content = focusedThread ? (
         <>
diff --git a/apps/comments-ui/src/components/content/context-menus/admin-context-menu.tsx b/apps/comments-ui/src/components/content/context-menus/admin-context-menu.tsx
index e7db175634f..276ebaad389 100644
--- a/apps/comments-ui/src/components/content/context-menus/admin-context-menu.tsx
+++ b/apps/comments-ui/src/components/content/context-menus/admin-context-menu.tsx
@@ -5,7 +5,7 @@ import PencilIcon from '../../../images/icons/pencil.svg?react';
 import PinIcon from '../../../images/icons/pin.svg?react';
 import PinOffIcon from '../../../images/icons/pin-off.svg?react';
 import TrashIcon from '../../../images/icons/trash.svg?react';
-import {Comment, useAppContext, useLabs} from '../../../app-context';
+import {Comment, useAppContext} from '../../../app-context';
 
 type Props = {
     comment: Comment;
@@ -15,7 +15,6 @@ type Props = {
 };
 const AdminContextMenu: React.FC<Props> = ({comment, close, showAuthorActions = false, toggleEdit}) => {
     const {dispatchAction, t, adminUrl} = useAppContext();
-    const labs = useLabs();
 
     const closeAfter = (action: () => void) => () => {
         action();
@@ -35,7 +34,7 @@ const AdminContextMenu: React.FC<Props> = ({comment, close, showAuthorActions =
     const unpinComment = closeAfter(() => dispatchAction('unpinComment', comment));
 
     const isHidden = comment.status !== 'published';
-    const canPin = labs?.commentsPinning === true && !comment.parent_id && comment.status !== 'deleted';
+    const canPin = !comment.parent_id && comment.status !== 'deleted';
     const adminCommentUrl = adminUrl ? `${adminUrl}#/comments/?id=is:${comment.id}` : null;
     const baseItemClassName = 'flex w-full items-center gap-3 rounded px-3 py-2 text-left text-[14px] leading-5 transition-colors hover:bg-neutral-100 dark:hover:bg-neutral-700';
     const itemClassName = `${baseItemClassName} text-neutral-900 dark:text-white`;
diff --git a/apps/comments-ui/src/components/content/focused-thread.tsx b/apps/comments-ui/src/components/content/focused-thread.tsx
index 44c4a46ea67..efd08ebedfa 100644
--- a/apps/comments-ui/src/components/content/focused-thread.tsx
+++ b/apps/comments-ui/src/components/content/focused-thread.tsx
@@ -42,8 +42,8 @@ const FocusedThread: React.FC<FocusedThreadProps> = ({focusedThread}) => {
                 </a>
             </div>
 
-            <CommentComponent comment={focusedComment} parent={topLevelComment} useThreading={true}>
-                <ReplyTree replies={focusedComment.nestedReplies} threadParentComment={topLevelComment} useThreading={true} />
+            <CommentComponent comment={focusedComment} parent={topLevelComment}>
+                <ReplyTree replies={focusedComment.nestedReplies} threadParentComment={topLevelComment} />
             </CommentComponent>
         </div>
     );
diff --git a/apps/comments-ui/src/components/content/forms/form.tsx b/apps/comments-ui/src/components/content/forms/form.tsx
index cee6fbca752..54e9b02c4cd 100644
--- a/apps/comments-ui/src/components/content/forms/form.tsx
+++ b/apps/comments-ui/src/components/content/forms/form.tsx
@@ -293,7 +293,7 @@ type FormWrapperProps = {
     isOpen: boolean;
     reduced: boolean;
     openForm?: OpenCommentForm;
-    threadedLayout?: boolean;
+    layoutVariant?: 'main' | 'reply';
     children: React.ReactNode;
 };
 
@@ -302,9 +302,11 @@ const FormWrapper: React.FC<FormWrapperProps> = ({
     isOpen,
     reduced,
     openForm,
-    threadedLayout = false,
+    layoutVariant = 'main',
     children
 }) => {
+    const isReplyLayout = layoutVariant === 'reply';
+
     const {member, dispatchAction} = useAppContext();
 
     const memberName = member?.name;
@@ -364,14 +366,14 @@ const FormWrapper: React.FC<FormWrapperProps> = ({
     }, [editor, editName, memberName]);
 
     return (
-        <div className={`${threadedLayout ? '' : '-mx-2 mt-[-10px]'} rounded-md transition duration-200 ${isOpen ? 'cursor-default' : 'cursor-pointer'}`}>
+        <div className={`${isReplyLayout ? '' : '-mx-2 mt-[-10px]'} rounded-md transition duration-200 ${isOpen ? 'cursor-default' : 'cursor-pointer'}`}>
             <div className="relative w-full" onClick={focusEditor}>
                 <div className="pr-[1px] font-sans leading-normal dark:text-neutral-300">
                     <div className={`relative mb-7 w-full pl-[40px] transition-[padding] delay-100 duration-150 sm:pl-[44px] ${reduced && 'pl-0'} ${openStyles}`}>
                         {children}
                     </div>
                 </div>
-                <div className={`absolute left-0 flex h-11 w-full items-start justify-start sm:h-12 ${threadedLayout ? 'top-0' : 'top-1'}`}>
+                <div className={`absolute left-0 flex h-11 w-full items-start justify-start sm:h-12 ${isReplyLayout ? 'top-0' : 'top-1'}`}>
                     <div className="pointer-events-none mr-2 grow-0 sm:mr-3">
                         <Avatar member={member} />
                     </div>
diff --git a/apps/comments-ui/src/components/content/forms/reply-form.tsx b/apps/comments-ui/src/components/content/forms/reply-form.tsx
index cf335dbf286..786a3722253 100644
--- a/apps/comments-ui/src/components/content/forms/reply-form.tsx
+++ b/apps/comments-ui/src/components/content/forms/reply-form.tsx
@@ -8,10 +8,9 @@ import {useRefCallback} from '../../../utils/hooks';
 type Props = {
     openForm: OpenCommentForm;
     parent: Comment;
-    threadedLayout?: boolean;
 }
 
-const ReplyForm: React.FC<Props> = ({openForm, parent, threadedLayout = false}) => {
+const ReplyForm: React.FC<Props> = ({openForm, parent}) => {
     const {postId, dispatchAction, t} = useAppContext();
     const [, setForm] = useRefCallback<HTMLDivElement>(scrollToElement);
 
@@ -45,8 +44,8 @@ const ReplyForm: React.FC<Props> = ({openForm, parent, threadedLayout = false})
 
     return (
         <div ref={setForm} data-testid="reply-form">
-            <div className={`${threadedLayout ? '' : 'mt-[-16px]'} pr-2`}>
-                <FormWrapper editor={editor} isOpen={true} openForm={openForm} reduced={isMobile()} threadedLayout={threadedLayout}>
+            <div className="pr-2">
+                <FormWrapper editor={editor} isOpen={true} layoutVariant="reply" openForm={openForm} reduced={isMobile()}>
                     <Form
                         close={close}
                         editor={editor}
diff --git a/apps/comments-ui/src/components/content/pinned-label.tsx b/apps/comments-ui/src/components/content/pinned-label.tsx
index 449ab35244c..752e3383574 100644
--- a/apps/comments-ui/src/components/content/pinned-label.tsx
+++ b/apps/comments-ui/src/components/content/pinned-label.tsx
@@ -1,13 +1,12 @@
 import PinIcon from '../../images/icons/pin.svg?react';
 import PinOffIcon from '../../images/icons/pin-off.svg?react';
 import React from 'react';
-import {Comment, useAppContext, useLabs} from '../../app-context';
+import {Comment, useAppContext} from '../../app-context';
 
 const PinnedLabel: React.FC<{comment: Comment}> = ({comment}) => {
     const {dispatchAction, isAdmin, t} = useAppContext();
-    const labs = useLabs();
 
-    if (labs?.commentsPinning !== true || !comment.pinned) {
+    if (!comment.pinned) {
         return null;
     }
 
diff --git a/apps/comments-ui/src/components/content/replies.tsx b/apps/comments-ui/src/components/content/replies.tsx
index 5c60bcf981f..484f23ce941 100644
--- a/apps/comments-ui/src/components/content/replies.tsx
+++ b/apps/comments-ui/src/components/content/replies.tsx
@@ -7,9 +7,8 @@ const INITIAL_REPLIES_SHOWN = 3;
 
 export type RepliesProps = {
     comment: Comment;
-    useThreading?: boolean;
 };
-const Replies: React.FC<RepliesProps> = ({comment, useThreading = false}) => {
+const Replies: React.FC<RepliesProps> = ({comment}) => {
     const {commentIdToScrollTo} = useAppContext();
     const initialReplyIds = useRef(new Set(comment.replies.map(reply => reply.id)));
 
@@ -35,9 +34,8 @@ const Replies: React.FC<RepliesProps> = ({comment, useThreading = false}) => {
                     key={reply.id}
                     comment={reply}
                     isLastSibling={idx === visibleReplies.length - 1}
-                    layoutVariant={useThreading ? 'reply' : 'root'}
+                    layoutVariant="reply"
                     parent={comment}
-                    useThreading={useThreading}
                 />
             ))}
             {hiddenRepliesCount > 0 && <RepliesPagination count={hiddenRepliesCount} loadMore={loadMore}/>}
diff --git a/apps/comments-ui/src/components/content/reply-tree.tsx b/apps/comments-ui/src/components/content/reply-tree.tsx
index 34ad2548cd6..212beb6992a 100644
--- a/apps/comments-ui/src/components/content/reply-tree.tsx
+++ b/apps/comments-ui/src/components/content/reply-tree.tsx
@@ -9,9 +9,8 @@ import {useThreadingContext} from '../../utils/threading-context';
 const ReplyTreeNode: React.FC<{
     reply: ThreadedReply;
     threadParentComment: Comment;
-    useThreading: boolean;
     depth: number;
-}> = ({reply, threadParentComment, useThreading, depth}) => {
+}> = ({reply, threadParentComment, depth}) => {
     const {t} = useAppContext();
     const {requestFocusedThreadView} = useNavActions();
     const {maxThreadDepth} = useThreadingContext();
@@ -28,7 +27,6 @@ const ReplyTreeNode: React.FC<{
                 depth={depth + 1}
                 reply={childReply}
                 threadParentComment={threadParentComment}
-                useThreading={useThreading}
             />
         ));
     } else if (hasNestedReplies && atMaxDepth) {
@@ -50,7 +48,7 @@ const ReplyTreeNode: React.FC<{
     }
 
     return (
-        <CommentComponent comment={reply} isLastSibling={isLastSibling} layoutVariant="reply" parent={threadParentComment} useThreading={useThreading}>
+        <CommentComponent comment={reply} isLastSibling={isLastSibling} layoutVariant="reply" parent={threadParentComment}>
             {nestedReplies}
         </CommentComponent>
     );
@@ -59,9 +57,8 @@ const ReplyTreeNode: React.FC<{
 const ReplyTree: React.FC<{
     replies: ThreadedReply[];
     threadParentComment: Comment;
-    useThreading: boolean;
     startDepth?: number;
-}> = ({replies, threadParentComment, useThreading, startDepth = 1}) => {
+}> = ({replies, threadParentComment, startDepth = 1}) => {
     return (
         <>
             {replies.map(reply => (
@@ -70,7 +67,6 @@ const ReplyTree: React.FC<{
                     depth={startDepth}
                     reply={reply}
                     threadParentComment={threadParentComment}
-                    useThreading={useThreading}
                 />
             ))}
         </>
diff --git a/apps/comments-ui/src/components/content/threaded-replies.tsx b/apps/comments-ui/src/components/content/threaded-replies.tsx
index 85482d06cb1..0e50dec7f98 100644
--- a/apps/comments-ui/src/components/content/threaded-replies.tsx
+++ b/apps/comments-ui/src/components/content/threaded-replies.tsx
@@ -5,15 +5,14 @@ import {buildThreadedReplies} from '../../utils/thread-graph';
 
 export type ThreadedRepliesProps = {
     comment: Comment;
-    useThreading: boolean;
 };
 
-const ThreadedReplies: React.FC<ThreadedRepliesProps> = ({comment, useThreading}) => {
+const ThreadedReplies: React.FC<ThreadedRepliesProps> = ({comment}) => {
     const threadedReplies = useMemo(() => buildThreadedReplies(comment), [comment]);
 
     return (
         <div>
-            <ReplyTree replies={threadedReplies} threadParentComment={comment} useThreading={useThreading} />
+            <ReplyTree replies={threadedReplies} threadParentComment={comment} />
         </div>
     );
 };
diff --git a/apps/comments-ui/test/e2e/actions.test.ts b/apps/comments-ui/test/e2e/actions.test.ts
index e198ece919a..4b9910c27f4 100644
--- a/apps/comments-ui/test/e2e/actions.test.ts
+++ b/apps/comments-ui/test/e2e/actions.test.ts
@@ -249,8 +249,7 @@ test.describe('Actions', async () => {
         const {frame} = await initializeTest(page);
 
         // Check like button is not filled yet
-        const comment = frame.getByTestId('comment-component').nth(0);
-        const reply = comment.getByTestId('comment-component').nth(0);
+        const reply = frame.getByTestId('comment-component').nth(1);
         // check if reply contains text This is a reply to 1
         await expect(reply).toContainText('This is a reply to 1');
 
@@ -289,13 +288,13 @@ test.describe('Actions', async () => {
 
         // Click button
         await replyButton.click();
-        const editor = comment.getByTestId('form-editor');
+        const replyForm = frame.getByTestId('reply-form');
+        const editor = replyForm.getByTestId('form-editor');
         await expect(editor).toBeVisible();
         // Wait for focused
         await waitEditorFocused(editor);
 
         // Ensure form data is correct
-        const replyForm = frame.getByTestId('reply-form');
         await expect(replyForm.getByTestId('avatar-image')).toHaveAttribute('src', 'https://example.com/avatar.jpg');
 
         // Should not include the replying-to-reply indicator
@@ -306,7 +305,7 @@ test.describe('Actions', async () => {
         await expect(editor).toHaveText('This is a reply 123');
 
         // Click reply button
-        const submitButton = comment.getByTestId('submit-form-button');
+        const submitButton = replyForm.getByTestId('submit-form-button');
         await submitButton.click();
 
         // Check total amount of comments increased
@@ -317,13 +316,13 @@ test.describe('Actions', async () => {
     async function testReplyToReply(page) {
         const {frame} = await initializeTest(page);
 
-        const parentComment = frame.getByTestId('comment-component').nth(0);
-        const replyComment = parentComment.getByTestId('comment-component').nth(0);
+        const replyComment = frame.getByTestId('comment-component').nth(1);
 
         const replyReplyButton = replyComment.getByTestId('reply-button');
         await replyReplyButton.click();
 
-        const editor = parentComment.getByTestId('form-editor');
+        const replyForm = frame.getByTestId('reply-form');
+        const editor = replyForm.getByTestId('form-editor');
         await expect(editor).toBeVisible();
         await waitEditorFocused(editor);
 
@@ -336,19 +335,17 @@ test.describe('Actions', async () => {
         // give time for spinner to show
         mockedApi.setDelay(100);
 
-        const submitButton = parentComment.getByTestId('submit-form-button');
+        const submitButton = replyForm.getByTestId('submit-form-button');
         await submitButton.click();
 
         // Spinner is shown
         await expect(frame.getByTestId('button-spinner')).toBeVisible();
         await expect(frame.getByTestId('button-spinner')).not.toBeVisible();
 
-        // Comment gets added and has correct contents
+        // Comment gets added and has correct contents, nested below the reply it responds to
         await expect(frame.getByTestId('comment-component')).toHaveCount(3);
         await expect(frame.getByText('This is a reply to a reply')).toHaveCount(1);
-
-        // Should indicate this was a reply to a reply
-        await expect(frame.getByTestId('comment-in-reply-to')).toHaveText('This is a reply to 1');
+        await expect(frame.getByTestId('comment-component').nth(2)).toContainText('This is a reply to a reply');
 
         return {frame};
     }
@@ -381,88 +378,6 @@ test.describe('Actions', async () => {
         await testReplyToReply(page);
     });
 
-    test('Can highlight reply when clicking on reply to: snippet', async ({page}) => {
-        mockedApi.addComment({
-            html: '<p>This is comment 1</p>',
-            replies: [
-                mockedApi.buildReply({
-                    id: '2',
-                    html: '<p>This is a reply to 1</p>'
-                }),
-                mockedApi.buildReply({
-                    id: '3',
-                    html: '<p>This is a reply to a reply</p>',
-                    in_reply_to_id: '2',
-                    in_reply_to_snippet: 'This is a reply to 1'
-                })
-            ]
-        });
-
-        const {frame} = await initializeTest(page);
-
-        await frame.getByTestId('comment-in-reply-to').click();
-
-        // get the first reply which contains This is a reply to 1
-        const commentComponent = frame.getByTestId('comment-component').nth(1);
-
-        const replyComment = commentComponent.getByTestId('comment-content').nth(0);
-
-        // check that replyComment contains the text This is a reply to 1
-        await expect(replyComment).toHaveText('This is a reply to 1');
-
-        const markElement = await replyComment.locator('mark');
-        await expect(markElement).toBeVisible();
-
-        // Check that the mark element has the expected classes
-        await expect(markElement).toHaveClass(/animate-\[highlight_2\.5s_ease-out\]/);
-        await expect(markElement).toHaveClass(/\[animation-delay:1s\]/);
-        await expect(markElement).toHaveClass(/bg-yellow-300\/40/);
-        await expect(markElement).toHaveClass(/dark:bg-yellow-500\/40/);
-    });
-
-    test('Reply highlight disappears after a bit', async ({page}) => {
-        mockedApi.addComment({
-            html: '<p>This is comment 1</p>',
-            replies: [
-                mockedApi.buildReply({
-                    id: '2',
-                    html: '<p>This is a reply to 1</p>'
-                }),
-                mockedApi.buildReply({
-                    id: '3',
-                    html: '<p>This is a reply to a reply</p>',
-                    in_reply_to_id: '2',
-                    in_reply_to_snippet: 'This is a reply to 1'
-                })
-            ]
-        });
-
-        const {frame} = await initializeTest(page);
-
-        await frame.getByTestId('comment-in-reply-to').click();
-
-        // get the first reply which contains This is a reply to 1
-        const commentComponent = frame.getByTestId('comment-component').nth(1);
-
-        const replyComment = commentComponent.getByTestId('comment-content').nth(0);
-
-        // check that replyComment contains the text This is a reply to 1
-        await expect(replyComment).toHaveText('This is a reply to 1');
-
-        const markElement = await replyComment.locator('mark');
-        await expect(markElement).toBeVisible();
-
-        // Check that the mark element has the expected classes
-        await expect(markElement).toHaveClass(/animate-\[highlight_2\.5s_ease-out\]/);
-        await expect(markElement).toHaveClass(/\[animation-delay:1s\]/);
-        await expect(markElement).toHaveClass(/bg-yellow-300\/40/);
-        await expect(markElement).toHaveClass(/dark:bg-yellow-500\/40/);
-
-        const timeout = 3000;
-        await page.waitForTimeout(timeout);
-        await expect(markElement).not.toBeVisible();
-    });
-
     test('Can add expertise', async ({page}) => {
         mockedApi.setMember({name: 'John Doe', expertise: null});
 
@@ -618,34 +533,13 @@ test.describe('Actions', async () => {
 
         const {frame} = await initializeTest(page);
 
-        const comment = frame.getByTestId('comment-component').nth(0);
-        const replyToDelete = comment.getByTestId('comment-component').nth(0);
+        const replyToDelete = frame.getByTestId('comment-component').nth(1);
         await deleteComment(page, frame, replyToDelete);
 
         await expect(frame.getByTestId('comment-component')).toHaveCount(1);
         await expect(frame.getByTestId('replies-line')).not.toBeVisible();
     });
 
-    test('Deleting a reply updates pagination', async ({page}) => {
-        const loggedInMember = buildMember();
-        mockedApi.setMember(loggedInMember);
-
-        mockedApi.addComment({
-            html: '<p>Parent comment</p>',
-            // 6 replies
-            replies: Array.from({length: 6}, (_, i) => buildReply({member: loggedInMember, html: `<p>Reply ${i + 1}</p>`}))
-        });
-
-        const {frame} = await initializeTest(page);
-        await expect(frame.getByTestId('replies-pagination')).toContainText('3');
-
-        const replyToDelete = frame.getByTestId('comment-component').nth(2);
-        await deleteComment(page, frame, replyToDelete);
-
-        // One visible reply was deleted, so hidden count drops from 3 to 2
-        await expect(frame.getByTestId('replies-pagination')).toContainText('2');
-    });
-
     test('Can delete a comment with replies', async ({page}) => {
         const loggedInMember = buildMember();
         mockedApi.setMember(loggedInMember);
@@ -944,7 +838,10 @@ test.describe('Actions', async () => {
 
         // Get the parent comment and verify initial state
         const parentComment = frame.getByTestId('comment-component').nth(0);
-        const replies = await parentComment.getByTestId('comment-component').all();
+        const replies = [
+            frame.getByTestId('comment-component').nth(1),
+            frame.getByTestId('comment-component').nth(2)
+        ];
 
         // Verify initial state shows parent and replies
         await expect(parentComment).toContainText('Parent comment');
diff --git a/apps/comments-ui/test/e2e/admin-moderation.test.ts b/apps/comments-ui/test/e2e/admin-moderation.test.ts
index f4add5ef89e..71a301ce6f6 100644
--- a/apps/comments-ui/test/e2e/admin-moderation.test.ts
+++ b/apps/comments-ui/test/e2e/admin-moderation.test.ts
@@ -124,7 +124,7 @@ test.describe('Admin moderation', async () => {
             html: `<p>This is comment 1</p>`,
             member: {id: '1', uuid: '12345'}
         });
-        const {frame} = await initializeTest(page, {labs: {commentsPinning: true}});
+        const {frame} = await initializeTest(page);
 
         const moreButtons = frame.getByTestId('more-button');
         await expect(moreButtons).toHaveCount(1);
@@ -136,7 +136,7 @@ test.describe('Admin moderation', async () => {
 
     test('has pin option when signed in to Ghost admin and viewing another member comment', async ({page}) => {
         mockedApi.addComment({html: `<p>This is comment 1</p>`});
-        const {frame} = await initializeTest(page, {labs: {commentsPinning: true}});
+        const {frame} = await initializeTest(page);
 
         const moreButtons = frame.getByTestId('more-button');
         await expect(moreButtons).toHaveCount(1);
@@ -299,37 +299,6 @@ test.describe('Admin moderation', async () => {
         await expect(comments.nth(0)).toContainText('Hidden for members');
     });
 
-    test('updates in-reply-to snippets when hiding', async ({page}) => {
-        mockedApi.addComment({
-            id: '1',
-            html: '<p>This is comment 1</p>',
-            replies: [
-                buildReply({id: '2', html: '<p>This is reply 1</p>'}),
-                buildReply({id: '3', html: '<p>This is reply 2</p>', in_reply_to_id: '2', in_reply_to_snippet: 'This is reply 1'}),
-                buildReply({id: '4', html: '<p>This is reply 3</p>'})
-            ]
-        });
-
-        const {frame} = await initializeTest(page);
-        const comments = await frame.getByTestId('comment-component');
-        const replyToHide = comments.nth(1);
-        const inReplyToComment = comments.nth(2);
-
-        // Hide the 1st reply
-        await replyToHide.getByTestId('more-button').click();
-        await replyToHide.getByTestId('hide-button').click();
-
-        await expect(inReplyToComment).toContainText('[removed]');
-        await expect(inReplyToComment).not.toContainText('This is reply 1');
-
-        // Show it again
-        await replyToHide.getByTestId('more-button').click();
-        await replyToHide.getByTestId('show-button').click();
-
-        await expect(inReplyToComment).not.toContainText('[removed]');
-        await expect(inReplyToComment).toContainText('This is reply 1');
-    });
-
     test('has correct comments count', async ({page}) => {
         mockedApi.addComment({html: '<p>This is comment 1</p>', replies: [buildReply()]});
         mockedApi.addComment({html: '<p>This is comment 2</p>'});
diff --git a/apps/comments-ui/test/e2e/autoclose-forms.test.ts b/apps/comments-ui/test/e2e/autoclose-forms.test.ts
index b31f760fa69..19165867c40 100644
--- a/apps/comments-ui/test/e2e/autoclose-forms.test.ts
+++ b/apps/comments-ui/test/e2e/autoclose-forms.test.ts
@@ -34,8 +34,8 @@ test.describe('Autoclose forms', async () => {
     //       at the top of the comments list
 
     test('autocloses open reply forms when opening another', async ({}) => {
-        const comment1 = await frame.getByTestId('comment-component').nth(0);
-        await comment1.getByTestId('reply-button').nth(1).click();
+        const reply1 = await frame.getByTestId('comment-component').nth(1);
+        await reply1.getByTestId('reply-button').click();
 
         await expect(frame.getByTestId('form')).toHaveCount(2);
 
@@ -46,8 +46,8 @@ test.describe('Autoclose forms', async () => {
     });
 
     test('does not autoclose open reply form with unsaved changes', async ({}) => {
-        const comment1 = await frame.getByTestId('comment-component').nth(0);
-        await comment1.getByTestId('reply-button').nth(1).click();
+        const reply1 = await frame.getByTestId('comment-component').nth(1);
+        await reply1.getByTestId('reply-button').click();
 
         await expect(frame.getByTestId('form')).toHaveCount(2);
 
diff --git a/apps/comments-ui/test/e2e/comment-submission.test.ts b/apps/comments-ui/test/e2e/comment-submission.test.ts
index b864037a8c5..0bcb4d81023 100644
--- a/apps/comments-ui/test/e2e/comment-submission.test.ts
+++ b/apps/comments-ui/test/e2e/comment-submission.test.ts
@@ -63,6 +63,6 @@ test.describe('Reply submission', () => {
         await replyForm.getByTestId('submit-form-button').click();
 
         await expect(frame.getByText('My new reply')).toBeVisible();
-        await expect(parentComment.getByTestId('comment-component')).toHaveCount(3);
+        await expect(frame.getByTestId('comment-component')).toHaveCount(4);
     });
 });
diff --git a/apps/comments-ui/test/e2e/content.test.ts b/apps/comments-ui/test/e2e/content.test.ts
index 380eb0a797d..1cadd8bea32 100644
--- a/apps/comments-ui/test/e2e/content.test.ts
+++ b/apps/comments-ui/test/e2e/content.test.ts
@@ -159,10 +159,7 @@ test.describe('Deleted and Hidden Content', async () => {
         const {frame} = await initialize({
             mockedApi,
             page,
-            publication: 'Publisher Weekly',
-            labs: {
-                commentsThreads: true
-            }
+            publication: 'Publisher Weekly'
         });
 
         const deletedReply = frame.locator('[id="deleted-reply"]');
diff --git a/apps/comments-ui/test/e2e/labs.test.ts b/apps/comments-ui/test/e2e/labs.test.ts
index 5ef3c3060c6..a62a30d90a3 100644
--- a/apps/comments-ui/test/e2e/labs.test.ts
+++ b/apps/comments-ui/test/e2e/labs.test.ts
@@ -41,170 +41,4 @@ test.describe('Labs', async () => {
 
         await expect(frame.getByTestId('this-comes-from-a-flag')).not.toBeVisible();
     });
-
-    test('commentsThreads links to a focused thread at the maximum depth', async ({page}) => {
-        const mockedApi = new MockedApi({});
-        mockedApi.setMember({});
-
-        const parentId = 'aaa0000000000000000000';
-        const replyIds = [
-            'aaa0000000000000000001',
-            'aaa0000000000000000002',
-            'aaa0000000000000000003',
-            'aaa0000000000000000004',
-            'aaa0000000000000000005',
-            'aaa0000000000000000006'
-        ];
-
-        mockedApi.addComment({
-            id: parentId,
-            html: '<p>Parent comment</p>',
-            replies: replyIds.map((id, index) => mockedApi.buildReply({
-                id,
-                html: `<p>Reply ${index + 1}</p>`,
-                parent_id: parentId,
-                ...(index > 0 ? {in_reply_to_id: replyIds[index - 1]} : {})
-            })),
-            count: {
-                replies: replyIds.length
-            }
-        });
-
-        const {frame} = await initialize({
-            mockedApi,
-            page,
-            publication: 'Publisher Weekly',
-            labs: {
-                commentsThreads: true
-            }
-        });
-
-        await expect(frame.getByText('Reply 4')).toBeVisible();
-        await expect(frame.getByText('Reply 5')).not.toBeVisible();
-
-        await frame.getByTestId('continue-thread-button').click();
-
-        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[4]}$`));
-        await expect(frame.getByTestId('back-to-parent')).toBeVisible();
-        await expect(frame.getByTestId('see-full-discussion')).toBeVisible();
-        await expect(frame.getByText('Parent comment')).not.toBeVisible();
-        await expect(frame.getByText('Reply 4')).toBeVisible();
-        await expect(frame.getByText('Reply 5')).toBeVisible();
-        await expect(frame.locator('mark')).toHaveCount(0);
-
-        await page.goBack();
-
-        await expect(page).not.toHaveURL(/#ghost-comments-/);
-        await expect(frame.getByTestId('back-to-parent')).not.toBeVisible();
-        await expect(frame.getByText('Reply 4')).toBeVisible();
-        await expect(frame.getByText('Reply 5')).not.toBeVisible();
-
-        await frame.getByTestId('continue-thread-button').click();
-
-        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[4]}$`));
-        await expect(frame.getByTestId('back-to-parent')).toBeVisible();
-
-        await frame.getByTestId('back-to-parent').click();
-
-        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[3]}$`));
-        await expect(frame.getByText('Reply 4')).toBeVisible();
-        await expect(frame.getByTestId('back-to-parent')).not.toBeVisible();
-        await expect(frame.locator('mark')).toHaveCount(0);
-    });
-
-    test('commentsThreads uses a lower maximum depth on mobile', async ({page}) => {
-        const mockedApi = new MockedApi({});
-        mockedApi.setMember({});
-
-        const parentId = 'ccc0000000000000000000';
-        const replyIds = [
-            'ccc0000000000000000001',
-            'ccc0000000000000000002',
-            'ccc0000000000000000003',
-            'ccc0000000000000000004',
-            'ccc0000000000000000005'
-        ];
-
-        mockedApi.addComment({
-            id: parentId,
-            html: '<p>Parent comment</p>',
-            replies: replyIds.map((id, index) => mockedApi.buildReply({
-                id,
-                html: `<p>Mobile reply ${index + 1}</p>`,
-                parent_id: parentId,
-                ...(index > 0 ? {in_reply_to_id: replyIds[index - 1]} : {})
-            })),
-            count: {
-                replies: replyIds.length
-            }
-        });
-
-        const {frame} = await initialize({
-            mockedApi,
-            page,
-            publication: 'Publisher Weekly',
-            labs: {
-                commentsThreads: true
-            }
-        });
-
-        await page.setViewportSize({width: 390, height: 1000});
-
-        await expect(frame.getByText('Mobile reply 3')).toBeVisible();
-        await expect(frame.getByText('Mobile reply 4')).not.toBeVisible();
-
-        await frame.getByTestId('continue-thread-button').click();
-
-        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[3]}$`));
-        await expect(frame.getByText('Mobile reply 3')).toBeVisible();
-        await expect(frame.getByText('Mobile reply 4')).toBeVisible();
-
-        await frame.getByTestId('back-to-parent').click();
-
-        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[2]}$`));
-        await expect(frame.getByText('Mobile reply 3')).toBeVisible();
-        await expect(frame.getByTestId('back-to-parent')).not.toBeVisible();
-    });
-
-    test('commentsThreads highlights a nested comment in the main list when linked', async ({page}) => {
-        const mockedApi = new MockedApi({});
-        mockedApi.setMember({});
-
-        const parentId = 'bbb0000000000000000000';
-        const replyId = 'bbb0000000000000000001';
-
-        mockedApi.addComment({
-            id: parentId,
-            html: '<p>Parent comment</p>',
-            replies: [
-                mockedApi.buildReply({
-                    id: replyId,
-                    html: '<p>Nested reply</p>',
-                    parent_id: parentId
-                })
-            ],
-            count: {
-                replies: 1
-            }
-        });
-
-        const {frame} = await initialize({
-            mockedApi,
-            page,
-            publication: 'Publisher Weekly',
-            labs: {
-                commentsThreads: true
-            }
-        });
-
-        await frame.locator(`a[href*="ghost-comments-${replyId}"]`).click();
-
-        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyId}$`));
-
-        const parentComment = frame.locator(`[id="${parentId}"]`).getByTestId('comment-content').first();
-        const nestedComment = frame.locator(`[id="${replyId}"]`).getByTestId('comment-content').first();
-
-        await expect(parentComment.locator('mark')).toHaveCount(0);
-        await expect(nestedComment.locator('mark')).toContainText('Nested reply');
-    });
 });
diff --git a/apps/comments-ui/test/e2e/pagination.test.ts b/apps/comments-ui/test/e2e/pagination.test.ts
index 3dd4c413ba0..242af0ea3e9 100644
--- a/apps/comments-ui/test/e2e/pagination.test.ts
+++ b/apps/comments-ui/test/e2e/pagination.test.ts
@@ -72,7 +72,7 @@ test.describe('Pagination', async () => {
         await expect(frame.getByTestId('reply-pagination-button')).not.toBeVisible();
     });
 
-    test('collapses replies beyond 3 and expands client-side on click', async ({page}) => {
+    test('shows all replies without collapsing when there are more than 3', async ({page}) => {
         const mockedApi = new MockedApi({});
 
         mockedApi.addComment({
@@ -91,21 +91,12 @@ test.describe('Pagination', async () => {
             publication: 'Publisher Weekly'
         });
 
-        await expect(frame.getByTestId('reply-pagination-button')).toBeVisible();
-        await expect(frame.getByTestId('reply-pagination-button')).toContainText('Show 1 more reply');
-
-        // Only first 3 replies visible (plus the parent)
-        await expect(frame.getByTestId('comment-component')).toHaveCount(4);
+        await expect(frame.getByTestId('comment-component')).toHaveCount(5);
         await expect(frame.getByText('This is reply 1')).toBeVisible();
         await expect(frame.getByText('This is reply 2')).toBeVisible();
         await expect(frame.getByText('This is reply 3')).toBeVisible();
-        await expect(frame.getByText('This is reply 4')).not.toBeVisible();
-
-        await frame.getByTestId('reply-pagination-button').click();
-
-        await expect(frame.getByTestId('reply-pagination-button')).not.toBeVisible();
-        await expect(frame.getByTestId('comment-component')).toHaveCount(5);
         await expect(frame.getByText('This is reply 4')).toBeVisible();
+        await expect(frame.getByTestId('reply-pagination-button')).not.toBeVisible();
     });
 
     test('Can handle comments with deleted member', async ({page}) => {
diff --git a/apps/comments-ui/test/e2e/permalink.test.ts b/apps/comments-ui/test/e2e/permalink.test.ts
index 2b0c001e3e3..89f99d061b9 100644
--- a/apps/comments-ui/test/e2e/permalink.test.ts
+++ b/apps/comments-ui/test/e2e/permalink.test.ts
@@ -11,13 +11,12 @@ async function setupPermalinkTest(
     page: Page,
     mockedApi: MockedApi,
     hash: string,
-    bodyHtml = '<html><head><meta charset="UTF-8" /></head><body></body></html>',
-    labs = {}
+    bodyHtml = '<html><head><meta charset="UTF-8" /></head><body></body></html>'
 ): Promise<FrameLocator> {
     const sitePath = MOCKED_SITE_URL;
     mockedApi.setSettings({
         settings: {
-            labs
+            labs: {}
         }
     });
 
@@ -312,7 +311,7 @@ test.describe('Comment Permalinks', async () => {
         await expect(targetElement).toBeVisible();
     });
 
-    test('highlights nested reply instead of top-level parent with commentsThreads enabled', async ({page}) => {
+    test('highlights nested reply instead of top-level parent', async ({page}) => {
         const mockedApi = new MockedApi({});
         mockedApi.setMember({});
 
@@ -340,13 +339,7 @@ test.describe('Comment Permalinks', async () => {
             }
         });
 
-        const commentsFrame = await setupPermalinkTest(
-            page,
-            mockedApi,
-            `#ghost-comments-${targetReplyId}`,
-            undefined,
-            {commentsThreads: true}
-        );
+        const commentsFrame = await setupPermalinkTest(page, mockedApi, `#ghost-comments-${targetReplyId}`);
 
         await expect(commentsFrame.getByText('Target nested reply')).toBeVisible();
 
@@ -360,7 +353,7 @@ test.describe('Comment Permalinks', async () => {
         await expect(replyContent.locator('mark')).toHaveCount(0, {timeout: 7000});
     });
 
-    test('highlights target reply instead of focused ancestor in commentsThreads focused view', async ({page}) => {
+    test('highlights target reply instead of focused ancestor in the focused view', async ({page}) => {
         const mockedApi = new MockedApi({});
         mockedApi.setMember({});
 
@@ -389,13 +382,7 @@ test.describe('Comment Permalinks', async () => {
         });
 
         const targetReplyId = replyIds[4];
-        const commentsFrame = await setupPermalinkTest(
-            page,
-            mockedApi,
-            `#ghost-comments-${targetReplyId}`,
-            undefined,
-            {commentsThreads: true}
-        );
+        const commentsFrame = await setupPermalinkTest(page, mockedApi, `#ghost-comments-${targetReplyId}`);
 
         await expect(commentsFrame.getByTestId('back-to-parent')).toBeVisible();
         await expect(commentsFrame.getByText('Nested reply 4')).toBeVisible();
@@ -412,7 +399,7 @@ test.describe('Comment Permalinks', async () => {
         await expect(commentsFrame.getByTestId('back-to-parent')).not.toBeVisible();
     });
 
-    test('opens commentsThreads focused view when target reply is not in the initial comments response', async ({page}) => {
+    test('opens the focused view when target reply is not in the initial comments response', async ({page}) => {
         const mockedApi = new MockedApi({});
         mockedApi.setMember({});
 
@@ -453,13 +440,7 @@ test.describe('Comment Permalinks', async () => {
         };
 
         const targetReplyId = replyIds[4];
-        const commentsFrame = await setupPermalinkTest(
-            page,
-            mockedApi,
-            `#ghost-comments-${targetReplyId}`,
-            undefined,
-            {commentsThreads: true}
-        );
+        const commentsFrame = await setupPermalinkTest(page, mockedApi, `#ghost-comments-${targetReplyId}`);
 
         await expect(commentsFrame.getByTestId('back-to-parent')).toBeVisible();
         await expect(commentsFrame.getByText('Lazy nested reply 4')).toBeVisible();
diff --git a/apps/comments-ui/test/e2e/reply-refetch.test.ts b/apps/comments-ui/test/e2e/reply-refetch.test.ts
index bea071d9e8f..b25cfff154a 100644
--- a/apps/comments-ui/test/e2e/reply-refetch.test.ts
+++ b/apps/comments-ui/test/e2e/reply-refetch.test.ts
@@ -40,10 +40,10 @@ test.describe('Reply submission', () => {
         await replyForm.getByTestId('submit-form-button').click();
 
         // All three replies should be visible after refetch
-        const replies = mainComment.getByTestId('comment-component');
-        await expect(replies).toHaveCount(3);
-        await expect(replies.nth(0)).toContainText('First reply');
-        await expect(replies.nth(1)).toContainText('Concurrent reply from User B');
-        await expect(replies.nth(2)).toContainText('User A reply');
+        const comments = frame.getByTestId('comment-component');
+        await expect(comments).toHaveCount(4);
+        await expect(comments.nth(1)).toContainText('First reply');
+        await expect(comments.nth(2)).toContainText('Concurrent reply from User B');
+        await expect(comments.nth(3)).toContainText('User A reply');
     });
 });
diff --git a/apps/comments-ui/test/e2e/threads.test.ts b/apps/comments-ui/test/e2e/threads.test.ts
new file mode 100644
index 00000000000..6033a98f937
--- /dev/null
+++ b/apps/comments-ui/test/e2e/threads.test.ts
@@ -0,0 +1,161 @@
+import {MockedApi, initialize} from '../utils/e2e';
+import {expect, test} from '@playwright/test';
+
+test.describe('Threads', async () => {
+    test('links to a focused thread at the maximum depth', async ({page}) => {
+        const mockedApi = new MockedApi({});
+        mockedApi.setMember({});
+
+        const parentId = 'aaa0000000000000000000';
+        const replyIds = [
+            'aaa0000000000000000001',
+            'aaa0000000000000000002',
+            'aaa0000000000000000003',
+            'aaa0000000000000000004',
+            'aaa0000000000000000005',
+            'aaa0000000000000000006'
+        ];
+
+        mockedApi.addComment({
+            id: parentId,
+            html: '<p>Parent comment</p>',
+            replies: replyIds.map((id, index) => mockedApi.buildReply({
+                id,
+                html: `<p>Reply ${index + 1}</p>`,
+                parent_id: parentId,
+                ...(index > 0 ? {in_reply_to_id: replyIds[index - 1]} : {})
+            })),
+            count: {
+                replies: replyIds.length
+            }
+        });
+
+        const {frame} = await initialize({
+            mockedApi,
+            page,
+            publication: 'Publisher Weekly'
+        });
+
+        await expect(frame.getByText('Reply 4')).toBeVisible();
+        await expect(frame.getByText('Reply 5')).not.toBeVisible();
+
+        await frame.getByTestId('continue-thread-button').click();
+
+        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[4]}$`));
+        await expect(frame.getByTestId('back-to-parent')).toBeVisible();
+        await expect(frame.getByTestId('see-full-discussion')).toBeVisible();
+        await expect(frame.getByText('Parent comment')).not.toBeVisible();
+        await expect(frame.getByText('Reply 4')).toBeVisible();
+        await expect(frame.getByText('Reply 5')).toBeVisible();
+        await expect(frame.locator('mark')).toHaveCount(0);
+
+        await page.goBack();
+
+        await expect(page).not.toHaveURL(/#ghost-comments-/);
+        await expect(frame.getByTestId('back-to-parent')).not.toBeVisible();
+        await expect(frame.getByText('Reply 4')).toBeVisible();
+        await expect(frame.getByText('Reply 5')).not.toBeVisible();
+
+        await frame.getByTestId('continue-thread-button').click();
+
+        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[4]}$`));
+        await expect(frame.getByTestId('back-to-parent')).toBeVisible();
+
+        await frame.getByTestId('back-to-parent').click();
+
+        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[3]}$`));
+        await expect(frame.getByText('Reply 4')).toBeVisible();
+        await expect(frame.getByTestId('back-to-parent')).not.toBeVisible();
+        await expect(frame.locator('mark')).toHaveCount(0);
+    });
+
+    test('uses a lower maximum thread depth on mobile', async ({page}) => {
+        const mockedApi = new MockedApi({});
+        mockedApi.setMember({});
+
+        const parentId = 'ccc0000000000000000000';
+        const replyIds = [
+            'ccc0000000000000000001',
+            'ccc0000000000000000002',
+            'ccc0000000000000000003',
+            'ccc0000000000000000004',
+            'ccc0000000000000000005'
+        ];
+
+        mockedApi.addComment({
+            id: parentId,
+            html: '<p>Parent comment</p>',
+            replies: replyIds.map((id, index) => mockedApi.buildReply({
+                id,
+                html: `<p>Mobile reply ${index + 1}</p>`,
+                parent_id: parentId,
+                ...(index > 0 ? {in_reply_to_id: replyIds[index - 1]} : {})
+            })),
+            count: {
+                replies: replyIds.length
+            }
+        });
+
+        const {frame} = await initialize({
+            mockedApi,
+            page,
+            publication: 'Publisher Weekly'
+        });
+
+        await page.setViewportSize({width: 390, height: 1000});
+
+        await expect(frame.getByText('Mobile reply 3')).toBeVisible();
+        await expect(frame.getByText('Mobile reply 4')).not.toBeVisible();
+
+        await frame.getByTestId('continue-thread-button').click();
+
+        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[3]}$`));
+        await expect(frame.getByText('Mobile reply 3')).toBeVisible();
+        await expect(frame.getByText('Mobile reply 4')).toBeVisible();
+
+        await frame.getByTestId('back-to-parent').click();
+
+        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyIds[2]}$`));
+        await expect(frame.getByText('Mobile reply 3')).toBeVisible();
+        await expect(frame.getByTestId('back-to-parent')).not.toBeVisible();
+    });
+
+    test('highlights a nested comment in the main list when linked', async ({page}) => {
+        const mockedApi = new MockedApi({});
+        mockedApi.setMember({});
+
+        const parentId = 'bbb0000000000000000000';
+        const replyId = 'bbb0000000000000000001';
+
+        mockedApi.addComment({
+            id: parentId,
+            html: '<p>Parent comment</p>',
+            replies: [
+                mockedApi.buildReply({
+                    id: replyId,
+                    html: '<p>Nested reply</p>',
+                    parent_id: parentId
+                })
+            ],
+            count: {
+                replies: 1
+            }
+        });
+
+        const {frame} = await initialize({
+            mockedApi,
+            page,
+            publication: 'Publisher Weekly'
+        });
+
+        await frame.locator(`a[href*="ghost-comments-${replyId}"]`).click();
+
+        await expect(page).toHaveURL(new RegExp(`#ghost-comments-${replyId}$`));
+
+        const parentComment = frame.locator(`[id="${parentId}"]`).getByTestId('comment-content').first();
+        const nestedComment = frame.locator(`[id="${replyId}"]`).getByTestId('comment-content').first();
+
+        await expect(parentComment.locator('mark')).toHaveCount(0);
+        await expect(nestedComment.locator('mark')).toContainText('Nested reply');
+    });
+});
diff --git a/apps/comments-ui/test/unit/components/content/comment.test.jsx b/apps/comments-ui/test/unit/components/content/comment.test.jsx
index e7e04955a03..42680fbfa15 100644
--- a/apps/comments-ui/test/unit/components/content/comment.test.jsx
+++ b/apps/comments-ui/test/unit/components/content/comment.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {AppContext} from '../../../../src/app-context';
-import {CommentComponent, RepliedToSnippet} from '../../../../src/components/content/comment';
+import {CommentComponent} from '../../../../src/components/content/comment';
 import {buildComment} from '../../../utils/fixtures';
 import {fireEvent, render, screen} from '@testing-library/react';
 import {vi} from 'vitest';
@@ -27,25 +27,6 @@ const contextualRender = (ui, {appContext, ...renderOptions}) => {
 };
 
 describe('<CommentComponent>', function () {
-    it('renders reply-to-reply content', function () {
-        const reply1 = buildComment({
-            html: '<p>First reply</p>'
-        });
-        const reply2 = buildComment({
-            in_reply_to_id: reply1.id,
-            in_reply_to_snippet: 'First reply',
-            html: '<p>Second reply</p>'
-        });
-        const parent = buildComment({
-            replies: [reply1, reply2]
-        });
-        const appContext = {comments: [parent]};
-
-        contextualRender(<CommentComponent comment={reply2} parent={parent} />, {appContext});
-
-        expect(screen.getByText('First reply')).toBeInTheDocument();
-    });
-
     it('outputs member uuid data attribute for published comments', function () {
         const comment = buildComment({
             status: 'published',
@@ -84,7 +65,7 @@ describe('<CommentComponent>', function () {
         expect(screen.getByTestId('dislike-button')).not.toHaveTextContent(/\d/);
     });
 
-    it('renders nested reply threads when commentsThreads is enabled', function () {
+    it('renders nested reply threads', function () {
         const reply1 = buildComment({
             html: '<p>First reply</p>'
         });
@@ -100,13 +81,10 @@ describe('<CommentComponent>', function () {
         });
         const appContext = {
             comments: [comment],
-            dispatchAction: () => {},
-            labs: {
-                commentsThreads: true
-            }
+            dispatchAction: () => {}
         };
 
-        const {container} = contextualRender(<CommentComponent comment={comment} useThreading={true} />, {appContext});
+        const {container} = contextualRender(<CommentComponent comment={comment} />, {appContext});
 
         expect(screen.getByText('First reply')).toBeInTheDocument();
         expect(screen.getByText('Second reply')).toBeInTheDocument();
@@ -114,7 +92,7 @@ describe('<CommentComponent>', function () {
         expect(screen.queryByTestId('replies-pagination')).not.toBeInTheDocument();
     });
 
-    it('hides reply-to-reply context when commentsThreads is enabled', function () {
+    it('does not render reply-to-reply context', function () {
         const reply1 = buildComment({
             html: '<p>First reply</p>'
         });
@@ -127,13 +105,10 @@ describe('<CommentComponent>', function () {
             replies: [reply1, reply2]
         });
         const appContext = {
-            comments: [parent],
-            labs: {
-                commentsThreads: true
-            }
+            comments: [parent]
         };
 
-        contextualRender(<CommentComponent comment={reply2} parent={parent} useThreading={true} />, {appContext});
+        contextualRender(<CommentComponent comment={reply2} parent={parent} />, {appContext});
 
         expect(screen.queryByText('Replied to')).not.toBeInTheDocument();
         expect(screen.queryByText('First reply')).not.toBeInTheDocument();
@@ -164,7 +139,7 @@ describe('<CommentComponent>', function () {
             }]
         };
 
-        contextualRender(<CommentComponent comment={parent} useThreading={true} />, {appContext});
+        contextualRender(<CommentComponent comment={parent} />, {appContext});
 
         const replyForm = screen.getByTestId('reply-form');
         const firstReply = document.getElementById(reply1.id);
@@ -199,7 +174,7 @@ describe('<CommentComponent>', function () {
             }]
         };
 
-        contextualRender(<CommentComponent comment={parent} useThreading={true} />, {appContext});
+        contextualRender(<CommentComponent comment={parent} />, {appContext});
 
         expect(screen.getByTestId('reply-form-elbow')).toBeInTheDocument();
         expect(screen.getByTestId('reply-form-continuation-line')).toBeInTheDocument();
@@ -222,49 +197,17 @@ describe('<CommentComponent>', function () {
             }]
         };
 
-        contextualRender(<CommentComponent comment={comment} useThreading={true} />, {appContext});
+        contextualRender(<CommentComponent comment={comment} />, {appContext});
 
         expect(screen.getByTestId('reply-form-elbow')).toBeInTheDocument();
         expect(screen.queryByTestId('reply-form-continuation-line')).not.toBeInTheDocument();
     });
 
-    it('keeps non-threaded reply-to-reply forms at the end of the parent reply list', function () {
-        const reply1 = buildComment({
-            html: '<p>First reply</p>'
-        });
-        const reply2 = buildComment({
-            html: '<p>Second reply</p>'
-        });
-        const parent = buildComment({
-            replies: [reply1, reply2],
-            count: {
-                replies: 2
-            }
-        });
-        const appContext = {
-            comments: [parent],
-            dispatchAction: () => {},
-            openCommentForms: [{
-                id: reply1.id,
-                parent_id: parent.id,
-                type: 'reply',
-                hasUnsavedChanges: false
-            }]
-        };
-
-        contextualRender(<CommentComponent comment={parent} />, {appContext});
-
-        const replyForm = screen.getByTestId('reply-form');
-        const secondReply = document.getElementById(reply2.id);
-
-        expect(secondReply.compareDocumentPosition(replyForm) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
-    });
-
     it('renders pinned badge inline after the timestamp', function () {
         const comment = buildComment({
             pinned: true
         });
-        const appContext = {comments: [comment], labs: {commentsPinning: true}};
+        const appContext = {comments: [comment]};
 
         contextualRender(<CommentComponent comment={comment} />, {appContext});
 
@@ -278,7 +221,7 @@ describe('<CommentComponent>', function () {
             pinned: true
         });
         const dispatchAction = vi.fn();
-        const appContext = {comments: [comment], dispatchAction, isAdmin: true, labs: {commentsPinning: true}};
+        const appContext = {comments: [comment], dispatchAction, isAdmin: true};
 
         contextualRender(<CommentComponent comment={comment} />, {appContext});
 
@@ -292,80 +235,4 @@ describe('<CommentComponent>', function () {
         expect(dispatchAction).toHaveBeenCalledWith('unpinComment', comment);
     });
 
-    it('keeps a bottom gap after pinned comments with replies', function () {
-        const reply = buildComment({
-            html: '<p>Reply</p>'
-        });
-        const comment = buildComment({
-            pinned: true,
-            replies: [reply]
-        });
-        const appContext = {comments: [comment]};
-
-        const {container} = contextualRender(<CommentComponent comment={comment} />, {appContext});
-
-        const pinnedComment = container.querySelector('[data-pinned="true"]');
-        expect(pinnedComment).toHaveClass('mb-4');
-        expect(pinnedComment).toHaveClass('py-3');
-    });
-});
-
-describe('<RepliedToSnippet>', function () {
-    it('renders a link when replied-to comment is published', function () {
-        const reply1 = buildComment({
-            html: '<p>First reply</p>'
-        });
-        const reply2 = buildComment({
-            in_reply_to_id: reply1.id,
-            in_reply_to_snippet: 'First reply',
-            html: '<p>Second reply</p>'
-        });
-        const parent = buildComment({
-            replies: [reply1, reply2]
-        });
-        const appContext = {comments: [parent]};
-
-        contextualRender(<RepliedToSnippet comment={reply2} />, {appContext});
-
-        const element = screen.getByTestId('comment-in-reply-to');
-        expect(element).toBeInstanceOf(HTMLAnchorElement);
-    });
-
-    it('does not render a link when replied-to comment is deleted', function () {
-        const reply1 = buildComment({
-            html: '<p>First reply</p>',
-            status: 'deleted'
-        });
-        const reply2 = buildComment({
-            in_reply_to_id: reply1.id,
-            in_reply_to_snippet: 'First reply',
-            html: '<p>Second reply</p>'
-        });
-        const parent = buildComment({
-            replies: [reply1, reply2]
-        });
-        const appContext = {comments: [parent]};
-
-        contextualRender(<RepliedToSnippet comment={reply2} />, {appContext});
-
-        const element = screen.getByTestId('comment-in-reply-to');
-        expect(element).toBeInstanceOf(HTMLSpanElement);
-    });
-
-    it('does not render a link when replied-to comment is missing (i.e. removed)', function () {
-        const reply2 = buildComment({
-            in_reply_to_id: 'missing',
-            in_reply_to_snippet: 'First reply',
-            html: '<p>Second reply</p>'
-        });
-        const parent = buildComment({
-            replies: [reply2]
-        });
-        const appContext = {comments: [parent]};
-
-        contextualRender(<RepliedToSnippet comment={reply2} />, {appContext});
-
-        const element = screen.getByTestId('comment-in-reply-to');
-        expect(element).toBeInstanceOf(HTMLSpanElement);
-    });
 });
diff --git a/apps/comments-ui/test/unit/components/content/content.test.jsx b/apps/comments-ui/test/unit/components/content/content.test.jsx
index 7c0ab28d49e..e206e2882bd 100644
--- a/apps/comments-ui/test/unit/components/content/content.test.jsx
+++ b/apps/comments-ui/test/unit/components/content/content.test.jsx
@@ -196,7 +196,7 @@ describe('<Content>', function () {
     });
 
     describe('threaded display', function () {
-        it('passes the commentsThreads display mode through to rendered comments', function () {
+        it('renders replies as nested threads', function () {
             const reply1 = buildComment({
                 html: '<p>First reply</p>'
             });
@@ -222,10 +222,7 @@ describe('<Content>', function () {
             contextualRender(<Content />, {
                 appContext: {
                     comments: [comment],
-                    commentCount: 1,
-                    labs: {
-                        commentsThreads: true
-                    }
+                    commentCount: 1
                 }
             });
 
diff --git a/apps/comments-ui/test/unit/components/content/context-menus/comment-context-menu.test.jsx b/apps/comments-ui/test/unit/components/content/context-menus/comment-context-menu.test.jsx
index 4b3b8914be6..482e1183ee9 100644
--- a/apps/comments-ui/test/unit/components/content/context-menus/comment-context-menu.test.jsx
+++ b/apps/comments-ui/test/unit/components/content/context-menus/comment-context-menu.test.jsx
@@ -42,7 +42,7 @@ describe('<CommentContextMenu>', () => {
         const dispatchAction = sinon.spy();
         const comment = buildComment({pinned: false});
 
-        contextualRender(<CommentContextMenu close={() => {}} comment={comment} />, {appContext: {dispatchAction, isAdmin: true, labs: {commentsPinning: true}}});
+        contextualRender(<CommentContextMenu close={() => {}} comment={comment} />, {appContext: {dispatchAction, isAdmin: true}});
 
         fireEvent.click(screen.getByTestId('pin-button'));
 
@@ -59,7 +59,7 @@ describe('<CommentContextMenu>', () => {
             pinned: false
         });
 
-        contextualRender(<CommentContextMenu close={() => {}} comment={comment} toggleEdit={() => {}} />, {appContext: {dispatchAction, isAdmin: true, member, labs: {commentsPinning: true}}});
+        contextualRender(<CommentContextMenu close={() => {}} comment={comment} toggleEdit={() => {}} />, {appContext: {dispatchAction, isAdmin: true, member}});
 
         expect(screen.getByTestId('edit')).toBeInTheDocument();
         expect(screen.getByTestId('delete')).toBeInTheDocument();
@@ -73,7 +73,7 @@ describe('<CommentContextMenu>', () => {
         const dispatchAction = sinon.spy();
         const comment = buildComment({pinned: true});
 
-        contextualRender(<CommentContextMenu close={() => {}} comment={comment} />, {appContext: {dispatchAction, isAdmin: true, labs: {commentsPinning: true}}});
+        contextualRender(<CommentContextMenu close={() => {}} comment={comment} />, {appContext: {dispatchAction, isAdmin: true}});
 
         fireEvent.click(screen.getByTestId('unpin-button'));
 
@@ -83,18 +83,10 @@ describe('<CommentContextMenu>', () => {
     it('does not show pin action for replies', () => {
         const comment = buildComment({parent_id: buildComment().id});
 
-        contextualRender(<CommentContextMenu close={() => {}} comment={comment} />, {appContext: {isAdmin: true, labs: {commentsPinning: true}}});
-
-        expect(screen.queryByTestId('pin-button')).not.toBeInTheDocument();
-        expect(screen.queryByTestId('unpin-button')).not.toBeInTheDocument();
-    });
-
-    it('does not show pin action when commentsPinning labs flag is disabled', () => {
-        const comment = buildComment({pinned: false});
-
         contextualRender(<CommentContextMenu close={() => {}} comment={comment} />, {appContext: {isAdmin: true}});
 
         expect(screen.queryByTestId('pin-button')).not.toBeInTheDocument();
         expect(screen.queryByTestId('unpin-button')).not.toBeInTheDocument();
     });
+
 });
diff --git a/apps/comments-ui/test/unit/components/content/pinned-label.test.jsx b/apps/comments-ui/test/unit/components/content/pinned-label.test.jsx
index ff4437cb056..6794d75e911 100644
--- a/apps/comments-ui/test/unit/components/content/pinned-label.test.jsx
+++ b/apps/comments-ui/test/unit/components/content/pinned-label.test.jsx
@@ -21,23 +21,10 @@ const contextualRender = (ui, {appContext, ...renderOptions} = {}) => {
 };
 
 describe('<PinnedLabel>', function () {
-    it('returns null when commentsPinning labs flag is disabled', function () {
-        const comment = buildComment({pinned: true});
-
-        const {container} = contextualRender(<PinnedLabel comment={comment} />, {
-            appContext: {labs: {}}
-        });
-
-        expect(container).toBeEmptyDOMElement();
-        expect(screen.queryByTestId('pinned-comment-label')).not.toBeInTheDocument();
-    });
-
-    it('returns null when the comment is not pinned even with the flag on', function () {
+    it('returns null when the comment is not pinned', function () {
         const comment = buildComment({pinned: false});
 
-        const {container} = contextualRender(<PinnedLabel comment={comment} />, {
-            appContext: {labs: {commentsPinning: true}}
-        });
+        const {container} = contextualRender(<PinnedLabel comment={comment} />);
 
         expect(container).toBeEmptyDOMElement();
     });
@@ -46,7 +33,7 @@ describe('<PinnedLabel>', function () {
         const comment = buildComment({pinned: true});
 
         contextualRender(<PinnedLabel comment={comment} />, {
-            appContext: {labs: {commentsPinning: true}, isAdmin: false}
+            appContext: {isAdmin: false}
         });
 
         const label = screen.getByTestId('pinned-comment-label');
@@ -59,7 +46,7 @@ describe('<PinnedLabel>', function () {
         const dispatchAction = vi.fn();
 
         contextualRender(<PinnedLabel comment={comment} />, {
-            appContext: {labs: {commentsPinning: true}, isAdmin: true, dispatchAction}
+            appContext: {isAdmin: true, dispatchAction}
         });
 
         const button = screen.getByRole('button', {name: 'Unpin comment'});
diff --git a/ghost/core/core/server/services/comments/comments-service.js b/ghost/core/core/server/services/comments/comments-service.js
index ff00b9ca2fa..72bf3b0024c 100644
--- a/ghost/core/core/server/services/comments/comments-service.js
+++ b/ghost/core/core/server/services/comments/comments-service.js
@@ -17,8 +17,7 @@ const messages = {
     cannotEditComment: 'You do not have permission to edit comments',
     cannotPinReply: 'Replies cannot be pinned',
     cannotPinDeletedComment: 'Deleted comments cannot be pinned',
-    invalidPinnedValue: 'Pinned must be a boolean value',
-    commentsPinningNotEnabled: 'Comment pinning is not enabled for this site.'
+    invalidPinnedValue: 'Pinned must be a boolean value'
 };
 
 const COMMENT_LIKE_SCORE = 1;
@@ -94,13 +93,10 @@ function getSafeWriteOptions(options = {}) {
 }
 
 class CommentsService {
-    constructor({config, logging, models, mailer, settingsCache, settingsHelpers, urlService, urlUtils, contentGating, labs}) {
+    constructor({config, logging, models, mailer, settingsCache, settingsHelpers, urlService, urlUtils, contentGating}) {
         /** @private */
         this.models = models;
 
-        /** @private */
-        this.labs = labs;
-
         /** @private */
         this.settingsCache = settingsCache;
 
@@ -445,8 +441,7 @@ class CommentsService {
      */
     async getComments(options) {
         this.checkEnabled();
-        const pinnedFirst = this.labs?.isSet('commentsPinning');
-        const page = await this.models.Comment.findPage(withPinnedSelect({...options, parentId: null, pinnedFirst}));
+        const page = await this.models.Comment.findPage(withPinnedSelect({...options, parentId: null, pinnedFirst: true}));
 
         return page;
     }
@@ -492,12 +487,11 @@ class CommentsService {
 
     async getAdminComments(options) {
         this.checkEnabled();
-        const pinnedFirst = this.labs?.isSet('commentsPinning');
         const page = await this.models.Comment.findPage(withPinnedSelect({
             ...options,
             parentId: null,
             isAdmin: true,
-            pinnedFirst
+            pinnedFirst: true
         }, {includeHidden: true}));
 
         return page;
@@ -515,12 +509,6 @@ class CommentsService {
         }
 
         if (Object.prototype.hasOwnProperty.call(data, 'pinned')) {
-            if (!this.labs?.isSet('commentsPinning')) {
-                throw new errors.MethodNotAllowedError({
-                    message: tpl(messages.commentsPinningNotEnabled)
-                });
-            }
-
             if (typeof data.pinned !== 'boolean') {
                 throw new errors.BadRequestError({
                     message: tpl(messages.invalidPinnedValue)
diff --git a/ghost/core/core/server/services/comments/index.js b/ghost/core/core/server/services/comments/index.js
index 096605b6a56..690ba75909c 100644
--- a/ghost/core/core/server/services/comments/index.js
+++ b/ghost/core/core/server/services/comments/index.js
@@ -15,7 +15,6 @@ class CommentsServiceWrapper {
         const membersService = require('../members');
         const db = require('../../data/db');
         const settingsHelpers = require('../settings-helpers');
-        const labs = require('../../../shared/labs');
 
         this.api = new CommentsService({
             config,
@@ -26,8 +25,7 @@ class CommentsServiceWrapper {
             settingsHelpers,
             urlService,
             urlUtils,
-            contentGating: membersService.contentGating,
-            labs
+            contentGating: membersService.contentGating
         });
 
         const stats = new CommentsStats({db});
diff --git a/ghost/core/core/shared/config/defaults.json b/ghost/core/core/shared/config/defaults.json
index 930eac4acd7..d26f8e12ef2 100644
--- a/ghost/core/core/shared/config/defaults.json
+++ b/ghost/core/core/shared/config/defaults.json
@@ -306,7 +306,7 @@
     },
     "comments": {
         "url": "https://cdn.jsdelivr.net/ghost/comments-ui@~{version}/umd/comments-ui.min.js",
-        "version": "1.5"
+        "version": "1.6"
     },
     "adminToolbar": {
         "url": "https://cdn.jsdelivr.net/ghost/admin-toolbar@~{version}/umd/admin-toolbar.min.js",
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index 362b1928193..006662ff006 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -28,9 +28,7 @@ const messages = {
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
     'automationAnalytics',
-    'customFonts',
-    'commentsThreads',
-    'commentsPinning'
+    'customFonts'
 ];
 
 // These features are considered publicly available and can be enabled/disabled by users
diff --git a/ghost/core/test/e2e-api/admin/comments.test.js b/ghost/core/test/e2e-api/admin/comments.test.js
index 0939bd717c5..3ccf8712012 100644
--- a/ghost/core/test/e2e-api/admin/comments.test.js
+++ b/ghost/core/test/e2e-api/admin/comments.test.js
@@ -127,12 +127,6 @@ describe(`Admin Comments API`, function () {
         await dbUtils.truncate('comments');
         await dbUtils.truncate('comment_likes');
         await dbUtils.truncate('comment_reports');
-
-        // mockManager.restore() runs at file-level `after()`, not `afterEach`,
-        // so labs state set by individual tests would otherwise leak across
-        // them. Re-enable commentsPinning at the start of every test so the
-        // disable-case test below cleanly resets without affecting siblings.
-        mockManager.mockLabsEnabled('commentsPinning');
     });
 
     afterAll(function () {
@@ -318,23 +312,6 @@ describe(`Admin Comments API`, function () {
             assert.equal(deletedComment.get('pinned_at'), null);
         });
 
-        it('Rejects pin attempts with 405 when commentsPinning labs flag is disabled', async function () {
-            mockManager.mockLabsDisabled('commentsPinning');
-
-            const commentToPin = await dbFns.addComment({
-                member_id: fixtureManager.get('members', 0).id
-            });
-
-            await adminApi.put(`comments/${commentToPin.id}/`).body({
-                comments: [{
-                    id: commentToPin.id,
-                    pinned: true
-                }]
-            }).expectStatus(405);
-
-            const unchangedComment = await models.Comment.findOne({id: commentToPin.id});
-            assert.equal(unchangedComment.get('pinned_at'), null);
-        });
     });
 
     describe('browse by post', function () {
diff --git a/ghost/core/test/unit/server/services/comments/comments-service.test.js b/ghost/core/test/unit/server/services/comments/comments-service.test.js
index 598a36d0fa6..ff8fec41de0 100644
--- a/ghost/core/test/unit/server/services/comments/comments-service.test.js
+++ b/ghost/core/test/unit/server/services/comments/comments-service.test.js
@@ -19,7 +19,7 @@ describe('Comments Service: CommentsService', function () {
         };
     }
 
-    function createClassInstance({labs = {}, commentsEnabled = 'all', commentStatus = 'published'} = {}) {
+    function createClassInstance({commentsEnabled = 'all', commentStatus = 'published'} = {}) {
         let lastCommentColumns;
         const commentFetchModels = [];
         const memberModel = {
@@ -152,10 +152,6 @@ describe('Comments Service: CommentsService', function () {
             }
         };
 
-        const labsStub = {
-            isSet: sinon.stub().callsFake(flag => labs[flag] || false)
-        };
-
         const instance = new CommentsService({
             config: {},
             logging: {},
@@ -170,12 +166,11 @@ describe('Comments Service: CommentsService', function () {
             contentGating: {
                 BLOCK_ACCESS: 'block',
                 checkPostAccess: sinon.stub().returns('allow')
-            },
-            labs: labsStub
+            }
         });
         instance.emails.notifyReport = sinon.stub().resolves();
 
-        return {instance, models, memberModel, commentModel, commentFetchModels, commentLikeQuery, commentLikeCollection, labs: labsStub};
+        return {instance, models, memberModel, commentModel, commentFetchModels, commentLikeQuery, commentLikeCollection};
     }
 
     describe('likeComment', function () {
@@ -263,7 +258,7 @@ describe('Comments Service: CommentsService', function () {
             });
         });
 
-        it('does not depend on a labs flag', async function () {
+        it('adds a dislike score', async function () {
             const {instance, models} = createClassInstance();
 
             await instance.dislikeComment('comment-id', {id: 'member-id'});
@@ -664,7 +659,7 @@ describe('Comments Service: CommentsService', function () {
     });
 
     describe('getComments', function () {
-        it('preserves net score ordering without a labs flag', async function () {
+        it('preserves net score ordering', async function () {
             const {instance, models} = createClassInstance();
 
             await instance.getComments({order: 'count__net_score desc, created_at desc'});
diff --git a/packages/i18n/locales/af/comments.json b/packages/i18n/locales/af/comments.json
index 60cfc995e73..09ba8eb8b8c 100644
--- a/packages/i18n/locales/af/comments.json
+++ b/packages/i18n/locales/af/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Antwoord",
     "Reply to": "",
     "Reply to comment": "Antwoord op kommentaar",
diff --git a/packages/i18n/locales/ar/comments.json b/packages/i18n/locales/ar/comments.json
index ab02a8b40f4..637ac90a841 100644
--- a/packages/i18n/locales/ar/comments.json
+++ b/packages/i18n/locales/ar/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "رد",
     "Reply to": "",
     "Reply to comment": "رد على هذا التعليق",
diff --git a/packages/i18n/locales/bg/comments.json b/packages/i18n/locales/bg/comments.json
index 8a667125d17..4cacd74a361 100644
--- a/packages/i18n/locales/bg/comments.json
+++ b/packages/i18n/locales/bg/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Още отговори",
     "Remove dislike": "Отмени нехаресването",
     "Remove like": "Отмени харесването",
-    "removed": "премахнат",
-    "Replied to": "Отговорено на",
     "Reply": "Отговор",
     "Reply to": "Отговор на",
     "Reply to comment": "Отговор на коментара",
diff --git a/packages/i18n/locales/bn/comments.json b/packages/i18n/locales/bn/comments.json
index 9198200aee0..b4c7c3bc264 100644
--- a/packages/i18n/locales/bn/comments.json
+++ b/packages/i18n/locales/bn/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "উত্তর",
     "Reply to": "",
     "Reply to comment": "মন্তব্যের উত্তর দিন",
diff --git a/packages/i18n/locales/bs/comments.json b/packages/i18n/locales/bs/comments.json
index 7de533de57d..18881a40c53 100644
--- a/packages/i18n/locales/bs/comments.json
+++ b/packages/i18n/locales/bs/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Odgovori",
     "Reply to": "",
     "Reply to comment": "Odgovori na komentar",
diff --git a/packages/i18n/locales/ca/comments.json b/packages/i18n/locales/ca/comments.json
index e63636578ee..d1673e14ab3 100644
--- a/packages/i18n/locales/ca/comments.json
+++ b/packages/i18n/locales/ca/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "Esborrat",
-    "Replied to": "Respost a",
     "Reply": "Respon",
     "Reply to": "Respon a",
     "Reply to comment": "Respon al comentari",
diff --git a/packages/i18n/locales/context.json b/packages/i18n/locales/context.json
index eda3fcf97a3..602df897d02 100644
--- a/packages/i18n/locales/context.json
+++ b/packages/i18n/locales/context.json
@@ -250,7 +250,6 @@
     "Remove dislike": "Accessible label for the icon-only dislike button on a comment, used when the comment has already been disliked by the current user (clicking removes the dislike)",
     "Remove like": "Accessible label for the icon-only like button on a comment, used when the comment has already been liked by the current user (clicking removes the like)",
     "Renews at {price}.": "Portal - label for a subscription that renews at a specific price",
-    "Replied to": "Comments label",
     "Reply": "Button to reply to a comment",
     "Reply to": "Shows what comment is being replied to.  (Followed by text of the comment being replied to)",
     "Reply to comment": "Placeholder value of the input box when placing a reply to a comment",
@@ -452,7 +451,6 @@
     "one-month": "Duration label for a one-month gift, used as an adjective in the gift purchase confirmation email (e.g. 'a one-month Patron membership')",
     "one-year": "Duration label for a one-year gift, used as an adjective in the gift purchase confirmation email (e.g. 'a one-year Patron membership')",
     "paid": "Will be substituted into status for 'You are receiving this because you are a <strong>%%{status}%% subscriber</strong> to {site}.'",
-    "removed": "label for removed comment",
     "trialing": "Will be substituted into status for 'You are receiving this because you are a <strong>%%{status}%% subscriber</strong> to {site}.'",
     "year": "the subscription interval (monthly), following the /",
     "your inbox": "Fallback text substituted into 'submittedEmailOrInbox' in Portal sign-in confirmation when no email address is available",
diff --git a/packages/i18n/locales/cs/comments.json b/packages/i18n/locales/cs/comments.json
index a50cef7dc40..614523d948d 100644
--- a/packages/i18n/locales/cs/comments.json
+++ b/packages/i18n/locales/cs/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Odpovědět",
     "Reply to": "",
     "Reply to comment": "Odpovědět na komentář",
diff --git a/packages/i18n/locales/da/comments.json b/packages/i18n/locales/da/comments.json
index 197823bcab2..949a9f37d3d 100644
--- a/packages/i18n/locales/da/comments.json
+++ b/packages/i18n/locales/da/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "fjernet",
-    "Replied to": "Svarede",
     "Reply": "Svar",
     "Reply to": "Svar",
     "Reply to comment": "Svar på kommentar",
diff --git a/packages/i18n/locales/de-CH/comments.json b/packages/i18n/locales/de-CH/comments.json
index 2899a695138..58723ab79cc 100644
--- a/packages/i18n/locales/de-CH/comments.json
+++ b/packages/i18n/locales/de-CH/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "entfernt",
-    "Replied to": "Antwortet auf",
     "Reply": "Antworten",
     "Reply to": "Antwort auf",
     "Reply to comment": "Auf Kommentar antworten",
diff --git a/packages/i18n/locales/de/comments.json b/packages/i18n/locales/de/comments.json
index 4bdb933e981..8976f15bb75 100644
--- a/packages/i18n/locales/de/comments.json
+++ b/packages/i18n/locales/de/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "entfernt",
-    "Replied to": "Antwort auf",
     "Reply": "Antworten",
     "Reply to": "Antwort auf",
     "Reply to comment": "Auf Kommentar antworten",
diff --git a/packages/i18n/locales/el/comments.json b/packages/i18n/locales/el/comments.json
index b0648dfb789..92645d11c49 100644
--- a/packages/i18n/locales/el/comments.json
+++ b/packages/i18n/locales/el/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Περισσότερες απαντήσεις",
     "Remove dislike": "Αφαίρεση \"Δεν μου αρέσει\"",
     "Remove like": "Αφαίρεση \"Μου αρέσει\"",
-    "removed": "αφαιρέθηκε",
-    "Replied to": "Απάντηση προς",
     "Reply": "Απάντηση",
     "Reply to": "Σε απάντηση προς",
     "Reply to comment": "Απάντηση στο σχόλιο",
diff --git a/packages/i18n/locales/en/comments.json b/packages/i18n/locales/en/comments.json
index 619ee235eb6..81618bb819c 100644
--- a/packages/i18n/locales/en/comments.json
+++ b/packages/i18n/locales/en/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "",
     "Reply to": "",
     "Reply to comment": "",
diff --git a/packages/i18n/locales/eo/comments.json b/packages/i18n/locales/eo/comments.json
index 619ee235eb6..81618bb819c 100644
--- a/packages/i18n/locales/eo/comments.json
+++ b/packages/i18n/locales/eo/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "",
     "Reply to": "",
     "Reply to comment": "",
diff --git a/packages/i18n/locales/es/comments.json b/packages/i18n/locales/es/comments.json
index 5338973fcac..8e90bf5db4f 100644
--- a/packages/i18n/locales/es/comments.json
+++ b/packages/i18n/locales/es/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Ver más respuestas",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "eliminado",
-    "Replied to": "En respuesta a",
     "Reply": "Responder",
     "Reply to": "Responder a",
     "Reply to comment": "Responder al comentario",
diff --git a/packages/i18n/locales/et/comments.json b/packages/i18n/locales/et/comments.json
index e48a94c5bd1..ea2ac7d44a9 100644
--- a/packages/i18n/locales/et/comments.json
+++ b/packages/i18n/locales/et/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Vasta",
     "Reply to": "",
     "Reply to comment": "Vasta kommentaarile",
diff --git a/packages/i18n/locales/eu/comments.json b/packages/i18n/locales/eu/comments.json
index 6e22cfda0ee..78180116c63 100644
--- a/packages/i18n/locales/eu/comments.json
+++ b/packages/i18n/locales/eu/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "kenduta",
-    "Replied to": "Honi erantzun dio",
     "Reply": "Erantzun",
     "Reply to": "Erantzun honi",
     "Reply to comment": "Erantzun iruzkin honi",
diff --git a/packages/i18n/locales/fa/comments.json b/packages/i18n/locales/fa/comments.json
index 8103b89ad42..eae015de7e2 100644
--- a/packages/i18n/locales/fa/comments.json
+++ b/packages/i18n/locales/fa/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "خواندن پاسخ\u200cهای بیشتر",
     "Remove dislike": "برگرداندن نپسندیدن",
     "Remove like": "برگرداندن پسندیدن",
-    "removed": "حذف\u200cشده",
-    "Replied to": "پاسخ به",
     "Reply": "پاسخ",
     "Reply to": "پاسخ به",
     "Reply to comment": "پاسخ به دیدگاه",
diff --git a/packages/i18n/locales/fi/comments.json b/packages/i18n/locales/fi/comments.json
index d9f8a66f234..47d7c64cf40 100644
--- a/packages/i18n/locales/fi/comments.json
+++ b/packages/i18n/locales/fi/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "poistettu",
-    "Replied to": "Vastattu:",
     "Reply": "Vastaa",
     "Reply to": "Vastaa:",
     "Reply to comment": "Vastaa kommenttiin",
diff --git a/packages/i18n/locales/fr/comments.json b/packages/i18n/locales/fr/comments.json
index e452869a747..9da831ea71d 100644
--- a/packages/i18n/locales/fr/comments.json
+++ b/packages/i18n/locales/fr/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Voir plus de réponses",
     "Remove dislike": "Annuler le « Je n’aime pas »",
     "Remove like": "Annuler le « J’aime »",
-    "removed": "supprimé",
-    "Replied to": "Répondu à",
     "Reply": "Répondre",
     "Reply to": "Répondre à",
     "Reply to comment": "Répondre au commentaire",
diff --git a/packages/i18n/locales/gd/comments.json b/packages/i18n/locales/gd/comments.json
index fb114a5f7c9..99928c9e6ab 100644
--- a/packages/i18n/locales/gd/comments.json
+++ b/packages/i18n/locales/gd/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "air a sguabadh às",
-    "Replied to": "Air freagairt fhaighinn",
     "Reply": "Cuir freagairt",
     "Reply to": "Cuir freagairt gu",
     "Reply to comment": "Cuir freagairt ri beachd",
diff --git a/packages/i18n/locales/he/comments.json b/packages/i18n/locales/he/comments.json
index 7cd9ace4c5c..e01810a5b0f 100644
--- a/packages/i18n/locales/he/comments.json
+++ b/packages/i18n/locales/he/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "תגובה",
     "Reply to": "",
     "Reply to comment": "הגיבו לתגובה",
diff --git a/packages/i18n/locales/hi/comments.json b/packages/i18n/locales/hi/comments.json
index 2bcd4719465..c8aacf7af10 100644
--- a/packages/i18n/locales/hi/comments.json
+++ b/packages/i18n/locales/hi/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "हटा दिया गया",
-    "Replied to": "को जवाब दिया",
     "Reply": "जवाब दें",
     "Reply to": "को जवाब दें",
     "Reply to comment": "टिप्पणी का जवाब दें",
diff --git a/packages/i18n/locales/hr/comments.json b/packages/i18n/locales/hr/comments.json
index 8812632b6b4..d62c13d0b3b 100644
--- a/packages/i18n/locales/hr/comments.json
+++ b/packages/i18n/locales/hr/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Odgovori",
     "Reply to": "",
     "Reply to comment": "Odgovori na komentar",
diff --git a/packages/i18n/locales/hu/comments.json b/packages/i18n/locales/hu/comments.json
index fc65c61c0bf..59397f908b0 100644
--- a/packages/i18n/locales/hu/comments.json
+++ b/packages/i18n/locales/hu/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "eltávolítva",
-    "Replied to": "Válaszolt erre",
     "Reply": "Válasz",
     "Reply to": "Válasz",
     "Reply to comment": "Válasz a hozzászólásra",
diff --git a/packages/i18n/locales/id/comments.json b/packages/i18n/locales/id/comments.json
index 3e895676f20..c88dcc53be4 100644
--- a/packages/i18n/locales/id/comments.json
+++ b/packages/i18n/locales/id/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Balas",
     "Reply to": "",
     "Reply to comment": "Balas komentar",
diff --git a/packages/i18n/locales/is/comments.json b/packages/i18n/locales/is/comments.json
index 619ee235eb6..81618bb819c 100644
--- a/packages/i18n/locales/is/comments.json
+++ b/packages/i18n/locales/is/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "",
     "Reply to": "",
     "Reply to comment": "",
diff --git a/packages/i18n/locales/it/comments.json b/packages/i18n/locales/it/comments.json
index 511ed2c1986..925535ca4d4 100644
--- a/packages/i18n/locales/it/comments.json
+++ b/packages/i18n/locales/it/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Leggi più risposte",
     "Remove dislike": "Rimuovi Non mi piace",
     "Remove like": "Rimuovi Mi piace",
-    "removed": "rimosso",
-    "Replied to": "Ha risposto a",
     "Reply": "Rispondi",
     "Reply to": "Rispondi a",
     "Reply to comment": "Rispondi al commento",
diff --git a/packages/i18n/locales/ja/comments.json b/packages/i18n/locales/ja/comments.json
index 80f229780a2..f1741af5e7c 100644
--- a/packages/i18n/locales/ja/comments.json
+++ b/packages/i18n/locales/ja/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "返信する",
     "Reply to": "",
     "Reply to comment": "コメントに返信する",
diff --git a/packages/i18n/locales/ko/comments.json b/packages/i18n/locales/ko/comments.json
index 7bca9d2561b..dbde42caf3e 100644
--- a/packages/i18n/locales/ko/comments.json
+++ b/packages/i18n/locales/ko/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "답글 더 보기",
     "Remove dislike": "싫어요 취소",
     "Remove like": "좋아요 취소",
-    "removed": "삭제됨",
-    "Replied to": "답글 대상",
     "Reply": "답글",
     "Reply to": "답글 달기",
     "Reply to comment": "댓글에 답글",
diff --git a/packages/i18n/locales/kz/comments.json b/packages/i18n/locales/kz/comments.json
index 7e2493f45f1..bcd7f273382 100644
--- a/packages/i18n/locales/kz/comments.json
+++ b/packages/i18n/locales/kz/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Жауап беру",
     "Reply to": "",
     "Reply to comment": "Пікірге жауап беру",
diff --git a/packages/i18n/locales/lt/comments.json b/packages/i18n/locales/lt/comments.json
index 9d606daf2d6..d7ef4b9eec5 100644
--- a/packages/i18n/locales/lt/comments.json
+++ b/packages/i18n/locales/lt/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Atsakyti",
     "Reply to": "",
     "Reply to comment": "Atsakyti į komentarą",
diff --git a/packages/i18n/locales/lv/comments.json b/packages/i18n/locales/lv/comments.json
index fa006b80ba4..7d41ef390be 100644
--- a/packages/i18n/locales/lv/comments.json
+++ b/packages/i18n/locales/lv/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "noņemts",
-    "Replied to": "Atbildēja uz",
     "Reply": "Atbildēt",
     "Reply to": "Atbildēt uz",
     "Reply to comment": "Atbildēt uz komentāru",
diff --git a/packages/i18n/locales/mk/comments.json b/packages/i18n/locales/mk/comments.json
index 05fa46a7ac2..f8ad5324a49 100644
--- a/packages/i18n/locales/mk/comments.json
+++ b/packages/i18n/locales/mk/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Одговорете",
     "Reply to": "",
     "Reply to comment": "Одговор на коментарот",
diff --git a/packages/i18n/locales/mn/comments.json b/packages/i18n/locales/mn/comments.json
index b59e8f6ea4b..4a198fca302 100644
--- a/packages/i18n/locales/mn/comments.json
+++ b/packages/i18n/locales/mn/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "хасагдсан",
-    "Replied to": "Хариулсан",
     "Reply": "Хариулах",
     "Reply to": "Хариулах",
     "Reply to comment": "Сэтгэгдэлд хариулах",
diff --git a/packages/i18n/locales/ms/comments.json b/packages/i18n/locales/ms/comments.json
index 619ee235eb6..81618bb819c 100644
--- a/packages/i18n/locales/ms/comments.json
+++ b/packages/i18n/locales/ms/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "",
     "Reply to": "",
     "Reply to comment": "",
diff --git a/packages/i18n/locales/nb/comments.json b/packages/i18n/locales/nb/comments.json
index e4d0b03f9fb..3750297de9b 100644
--- a/packages/i18n/locales/nb/comments.json
+++ b/packages/i18n/locales/nb/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "fjernet",
-    "Replied to": "Svarte",
     "Reply": "Svar",
     "Reply to": "Svar på",
     "Reply to comment": "Svar på kommentar",
diff --git a/packages/i18n/locales/ne/comments.json b/packages/i18n/locales/ne/comments.json
index ccd744fa854..c7f98ab9e4f 100644
--- a/packages/i18n/locales/ne/comments.json
+++ b/packages/i18n/locales/ne/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "हटाइयो",
-    "Replied to": "प्रत्युत्तर दिइयो",
     "Reply": "प्रत्युत्तर दिनुहोस्",
     "Reply to": "प्रत्युत्तर दिनुहोस्",
     "Reply to comment": "प्रतिक्रियाको प्रत्युत्तर दिनुहोस्",
diff --git a/packages/i18n/locales/nl/comments.json b/packages/i18n/locales/nl/comments.json
index 935361fc5a8..393df111fa6 100644
--- a/packages/i18n/locales/nl/comments.json
+++ b/packages/i18n/locales/nl/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "verwijderd",
-    "Replied to": "Geantwoord op",
     "Reply": "Beantwoorden",
     "Reply to": "Antwoord op",
     "Reply to comment": "Beantwoord deze reactie",
diff --git a/packages/i18n/locales/nn/comments.json b/packages/i18n/locales/nn/comments.json
index 619ee235eb6..81618bb819c 100644
--- a/packages/i18n/locales/nn/comments.json
+++ b/packages/i18n/locales/nn/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "",
     "Reply to": "",
     "Reply to comment": "",
diff --git a/packages/i18n/locales/pa/comments.json b/packages/i18n/locales/pa/comments.json
index 5ce4ee360f0..65ccd07a303 100644
--- a/packages/i18n/locales/pa/comments.json
+++ b/packages/i18n/locales/pa/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "ਹਟਾਇਆ ਗਿਆ",
-    "Replied to": "ਨੂੰ ਜਵਾਬ ਦਿੱਤਾ",
     "Reply": "ਜਵਾਬ",
     "Reply to": "ਨੂੰ ਜਵਾਬ ਦਿਓ",
     "Reply to comment": "ਟਿੱਪਣੀ ਦਾ ਜਵਾਬ ਦਿਓ",
diff --git a/packages/i18n/locales/pl/comments.json b/packages/i18n/locales/pl/comments.json
index e11ad2848b6..ed6a4c68053 100644
--- a/packages/i18n/locales/pl/comments.json
+++ b/packages/i18n/locales/pl/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "usunięte",
-    "Replied to": "Odpowiedź na",
     "Reply": "Odpowiedz",
     "Reply to": "Odpowiedz na",
     "Reply to comment": "Napisz odpowiedź do komentarza",
diff --git a/packages/i18n/locales/pt-BR/comments.json b/packages/i18n/locales/pt-BR/comments.json
index f51011c4267..29ba94ff2b6 100644
--- a/packages/i18n/locales/pt-BR/comments.json
+++ b/packages/i18n/locales/pt-BR/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Ler mais respostas",
     "Remove dislike": "Remover não gostei",
     "Remove like": "Remover gostei",
-    "removed": "removido",
-    "Replied to": "Respondeu a",
     "Reply": "Responder",
     "Reply to": "Responder a",
     "Reply to comment": "Responder ao comentário",
diff --git a/packages/i18n/locales/pt/comments.json b/packages/i18n/locales/pt/comments.json
index aa87a4bd70d..e36cf357615 100644
--- a/packages/i18n/locales/pt/comments.json
+++ b/packages/i18n/locales/pt/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "removido",
-    "Replied to": "Respondeu a",
     "Reply": "Responder",
     "Reply to": "Responder a",
     "Reply to comment": "Responder ao comentário",
diff --git a/packages/i18n/locales/ro/comments.json b/packages/i18n/locales/ro/comments.json
index 3e212c744e0..492386fcd7f 100644
--- a/packages/i18n/locales/ro/comments.json
+++ b/packages/i18n/locales/ro/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Răspunde",
     "Reply to": "",
     "Reply to comment": "Răspunde la comentariu",
diff --git a/packages/i18n/locales/ru/comments.json b/packages/i18n/locales/ru/comments.json
index 6ad9df6482a..70727f3d7b5 100644
--- a/packages/i18n/locales/ru/comments.json
+++ b/packages/i18n/locales/ru/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "удалён",
-    "Replied to": "Ответ на",
     "Reply": "Ответить",
     "Reply to": "Ответить на",
     "Reply to comment": "Ответить на комментарий",
diff --git a/packages/i18n/locales/si/comments.json b/packages/i18n/locales/si/comments.json
index 8ce00aa1427..1754f530707 100644
--- a/packages/i18n/locales/si/comments.json
+++ b/packages/i18n/locales/si/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "ප්\u200dරතිචාර දක්වන්\u200bන",
     "Reply to": "",
     "Reply to comment": "අදහසට \u200dරතිචාර දක්වන්\u200bන",
diff --git a/packages/i18n/locales/sk/comments.json b/packages/i18n/locales/sk/comments.json
index 78ade2a66e7..e318fe3c35d 100644
--- a/packages/i18n/locales/sk/comments.json
+++ b/packages/i18n/locales/sk/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "odstránené",
-    "Replied to": "Odpoveď na",
     "Reply": "Odpovedať",
     "Reply to": "Odpovedať na",
     "Reply to comment": "Odpovedať na komentár",
diff --git a/packages/i18n/locales/sl/comments.json b/packages/i18n/locales/sl/comments.json
index c9f41367705..8c1c64d0e11 100644
--- a/packages/i18n/locales/sl/comments.json
+++ b/packages/i18n/locales/sl/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "odstranjeno",
-    "Replied to": "Odgovorjeno na",
     "Reply": "Odgovori",
     "Reply to": "Odgovori na",
     "Reply to comment": "Odgovori na komentar",
diff --git a/packages/i18n/locales/sq/comments.json b/packages/i18n/locales/sq/comments.json
index adff259f2ef..53d0fbbb52e 100644
--- a/packages/i18n/locales/sq/comments.json
+++ b/packages/i18n/locales/sq/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "i hequr",
-    "Replied to": "Iu përgjigj",
     "Reply": "Përgjigju",
     "Reply to": "Përgjigju",
     "Reply to comment": "Përgjigju komentit",
diff --git a/packages/i18n/locales/sr-Cyrl/comments.json b/packages/i18n/locales/sr-Cyrl/comments.json
index 872f02209ae..02c3ccdb1ac 100644
--- a/packages/i18n/locales/sr-Cyrl/comments.json
+++ b/packages/i18n/locales/sr-Cyrl/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "уклоњено",
-    "Replied to": "Одговорено кориснику",
     "Reply": "Одговорите",
     "Reply to": "Одговорите кориснику",
     "Reply to comment": "Одговорите на коментар",
diff --git a/packages/i18n/locales/sr/comments.json b/packages/i18n/locales/sr/comments.json
index ef2c597929e..48aa1e45944 100644
--- a/packages/i18n/locales/sr/comments.json
+++ b/packages/i18n/locales/sr/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "uklonjeno",
-    "Replied to": "Odgovoreno korisniku",
     "Reply": "Odgovorite",
     "Reply to": "Odgovorite korisniku",
     "Reply to comment": "Odgovorite na komentar",
diff --git a/packages/i18n/locales/sv/comments.json b/packages/i18n/locales/sv/comments.json
index 82ea530f2d8..32c4b5a3f60 100644
--- a/packages/i18n/locales/sv/comments.json
+++ b/packages/i18n/locales/sv/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Läs fler svar",
     "Remove dislike": "Ta bort ogilla",
     "Remove like": "Ta bort gilla",
-    "removed": "borttagen",
-    "Replied to": "Svarade",
     "Reply": "Svar",
     "Reply to": "Svara",
     "Reply to comment": "Svara på kommentar",
diff --git a/packages/i18n/locales/sw/comments.json b/packages/i18n/locales/sw/comments.json
index 04654ad1beb..9956e6f75d5 100644
--- a/packages/i18n/locales/sw/comments.json
+++ b/packages/i18n/locales/sw/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Jibu",
     "Reply to": "",
     "Reply to comment": "Jibu maoni",
diff --git a/packages/i18n/locales/ta/comments.json b/packages/i18n/locales/ta/comments.json
index b0951da8516..e392dcc4180 100644
--- a/packages/i18n/locales/ta/comments.json
+++ b/packages/i18n/locales/ta/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "பதிலளிக்கவும்",
     "Reply to": "",
     "Reply to comment": "கருத்துக்கு பதிலளிக்கவும்",
diff --git a/packages/i18n/locales/th/comments.json b/packages/i18n/locales/th/comments.json
index d6711565e73..409f536e155 100644
--- a/packages/i18n/locales/th/comments.json
+++ b/packages/i18n/locales/th/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "ตอบกลับ",
     "Reply to": "",
     "Reply to comment": "ตอบกลับความคิดเห็น",
diff --git a/packages/i18n/locales/tr/comments.json b/packages/i18n/locales/tr/comments.json
index 64c7ced9fa7..3afc682e105 100644
--- a/packages/i18n/locales/tr/comments.json
+++ b/packages/i18n/locales/tr/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Daha fazla cevap oku",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "kaldırıldı",
-    "Replied to": "Cevaplandı",
     "Reply": "Cevapla",
     "Reply to": "Cevapla",
     "Reply to comment": "Yoruma cevap ver",
diff --git a/packages/i18n/locales/uk/comments.json b/packages/i18n/locales/uk/comments.json
index 2a1ca2aebca..aaa253f66eb 100644
--- a/packages/i18n/locales/uk/comments.json
+++ b/packages/i18n/locales/uk/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "Відповісти",
     "Reply to": "",
     "Reply to comment": "Відповісти на коментар",
diff --git a/packages/i18n/locales/ur/comments.json b/packages/i18n/locales/ur/comments.json
index afad1617e03..1141098c2a3 100644
--- a/packages/i18n/locales/ur/comments.json
+++ b/packages/i18n/locales/ur/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "جواب",
     "Reply to": "",
     "Reply to comment": "تبادلے کا جواب دیں",
diff --git a/packages/i18n/locales/uz/comments.json b/packages/i18n/locales/uz/comments.json
index 619ee235eb6..81618bb819c 100644
--- a/packages/i18n/locales/uz/comments.json
+++ b/packages/i18n/locales/uz/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "",
     "Remove dislike": "",
     "Remove like": "",
-    "removed": "",
-    "Replied to": "",
     "Reply": "",
     "Reply to": "",
     "Reply to comment": "",
diff --git a/packages/i18n/locales/vi/comments.json b/packages/i18n/locales/vi/comments.json
index 10b9a7162d3..a2e3d7d8769 100644
--- a/packages/i18n/locales/vi/comments.json
+++ b/packages/i18n/locales/vi/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "Đọc thêm trả lời",
     "Remove dislike": "Bỏ không thích",
     "Remove like": "Bỏ thích",
-    "removed": "đã xóa",
-    "Replied to": "Đã trả lời",
     "Reply": "Trả lời",
     "Reply to": "Trả lời",
     "Reply to comment": "Trả lời bình luận",
diff --git a/packages/i18n/locales/zh-Hant/comments.json b/packages/i18n/locales/zh-Hant/comments.json
index b7408835a97..a82057ffa0d 100644
--- a/packages/i18n/locales/zh-Hant/comments.json
+++ b/packages/i18n/locales/zh-Hant/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "閱讀更多回覆",
     "Remove dislike": "取消點踩",
     "Remove like": "取消點讚",
-    "removed": "已移除",
-    "Replied to": "已回覆",
     "Reply": "回覆",
     "Reply to": "回覆",
     "Reply to comment": "回覆留言",
diff --git a/packages/i18n/locales/zh/comments.json b/packages/i18n/locales/zh/comments.json
index 581bec829ff..39f03cd599d 100644
--- a/packages/i18n/locales/zh/comments.json
+++ b/packages/i18n/locales/zh/comments.json
@@ -55,8 +55,6 @@
     "Read more replies": "阅读更多回复",
     "Remove dislike": "取消点踩",
     "Remove like": "取消点赞",
-    "removed": "已移除",
-    "Replied to": "已回复",
     "Reply": "回复",
     "Reply to": "回复",
     "Reply to comment": "回复评论",