diff --git a/src/components/articles/DiscussionCard.tsx b/src/components/articles/DiscussionCard.tsx
index e43a3b20..af740fe7 100644
--- a/src/components/articles/DiscussionCard.tsx
+++ b/src/components/articles/DiscussionCard.tsx
@@ -190,7 +190,7 @@ const DiscussionCard: React.FC<DiscussionCardProps> = ({
 
   // Check if user can resolve/unresolve (admin or discussion author)
   const canResolve = isCommunityArticle && (isAdmin || discussion.is_author);
-  const canEditDiscussion = !!discussion.is_author;
+  const canEditDiscussion = !!discussion.is_author && !discussion.deleted_at;
   const shouldShowActions = (canResolve || canEditDiscussion) && !isEditing;
 
   const { mutate: toggleResolved, isPending: isToggling } =
diff --git a/src/components/articles/ReviewCard.tsx b/src/components/articles/ReviewCard.tsx
index 611036af..9d9cba22 100644
--- a/src/components/articles/ReviewCard.tsx
+++ b/src/components/articles/ReviewCard.tsx
@@ -168,7 +168,7 @@ const ReviewCard: FC<ReviewCardProps> = ({ review, refetch }) => {
               <div className="flex flex-col">
                 <span className="flex items-center gap-2 text-sm font-bold text-text-secondary">
                   {review.user.username}
-                  {review.is_author && (
+                  {review.is_author && !review.deleted_at && (
                     <>
                       <span className="text-[10px] font-normal text-text-tertiary">(You)</span>
                       {/* Fixed by Codex on 2026-02-15
diff --git a/src/components/common/NavBar.tsx b/src/components/common/NavBar.tsx
index 8b06e079..e7353766 100644
--- a/src/components/common/NavBar.tsx
+++ b/src/components/common/NavBar.tsx
@@ -225,11 +225,6 @@ const NavBar: React.FC = () => {
     <header className="sticky top-0 z-[1000] w-full border-b border-common-contrast/40 bg-common-background/70 text-text-primary backdrop-blur-md">
       <nav className="container mx-auto flex items-center justify-between px-4 py-2">
         <div className="flex items-center">
-          {/* Fixed by Codex on 2026-02-15
-              Who: Codex
-              What: Convert the back icon into a real button.
-              Why: Icon-only divs are not keyboard accessible or announced by screen readers.
-              How: Wrap the icon in a button with an aria-label and click handler. */}
           <button
             type="button"
             aria-label="Go back"