diff --git a/src/app/admin/clients/[id]/actions.ts b/src/app/admin/clients/[id]/actions.ts
index 413abe3..3506fd2 100644
--- a/src/app/admin/clients/[id]/actions.ts
+++ b/src/app/admin/clients/[id]/actions.ts
@@ -18,7 +18,6 @@ import {
   payments,
   clients,
   projects,
-  comments,
   client_emails,
   otp_codes,
 } from "@/db/schema";
@@ -368,21 +367,11 @@ export async function updateAcceptedTotal(id: string, formData: FormData) {
   }
 }
 
-// ── COMMENTS (admin reply) ────────────────────────────────────────────────────
-
-export async function postAdminComment(id: string, formData: FormData) {
-  await requireAdmin();
-  const entity = formData.get("entity") as string;
-  const body = (formData.get("body") as string)?.trim();
-  if (!body || !entity) throw new Error("Dati mancanti");
-  const [entity_type, entity_id] = entity.split(":");
-  if (!entity_type || !entity_id) throw new Error("Formato entity non valido");
-  const allowedTypes = ["task", "deliverable", "phase", "general"];
-  if (!allowedTypes.includes(entity_type)) throw new Error("entity_type non valido");
-  await db.insert(comments).values({ entity_type, entity_id, author: "admin", body });
-  const { path } = await resolveEntity(id);
-  revalidatePath(path);
-}
+// ── COMMENTS ──────────────────────────────────────────────────────────────────
+// La risposta dell'admin vive in `replyToConversation`
+// (src/app/admin/conversazioni/actions.ts): unica inbox, un solo punto di
+// scrittura. Qui c'era `postAdminComment`, che rispondeva sulla singola entità
+// dal tab Commenti del progetto — tab rimosso, action con lui.
 
 // ── ACCESSI PORTALE (whitelist OTP) ──────────────────────────────────────────
 // La whitelist è l'unico modo per entrare nel portale: nessuna auto-registrazione.
diff --git a/src/app/admin/conversazioni/actions.ts b/src/app/admin/conversazioni/actions.ts
index 1d0f1bc..a5984fe 100644
--- a/src/app/admin/conversazioni/actions.ts
+++ b/src/app/admin/conversazioni/actions.ts
@@ -15,7 +15,11 @@ async function requireAdmin() {
 /**
  * Admin reply from the Conversazioni inbox. Per project decision, replies are
  * saved as a "general" comment on the client (entity_id = clientId), so they
- * surface in the client's general chat and in the client detail CommentsTab.
+ * surface in the client's general chat.
+ *
+ * Questa è l'UNICA via di risposta dell'admin da quando il tab Commenti del
+ * progetto è stato rimosso: i messaggi su fase/task/deliverable si leggono qui
+ * con la loro etichetta, ma la risposta torna sempre sul thread generale.
  */
 export async function replyToConversation(clientId: string, formData: FormData) {
   await requireAdmin();
diff --git a/src/app/admin/projects/[id]/page.tsx b/src/app/admin/projects/[id]/page.tsx
index 9303190..83ca08e 100644
--- a/src/app/admin/projects/[id]/page.tsx
+++ b/src/app/admin/projects/[id]/page.tsx
@@ -5,7 +5,6 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { PhasesTab } from "@/components/admin/tabs/PhasesTab";
 import { PaymentsTab } from "@/components/admin/tabs/PaymentsTab";
 import { DocumentsTab } from "@/components/admin/tabs/DocumentsTab";
-import { CommentsTab } from "@/components/admin/tabs/CommentsTab";
 import { TimerTab } from "@/components/admin/tabs/TimerTab";
 import { OffersTab } from "@/components/admin/tabs/OffersTab";
 import { PhasesViewToggle } from "@/components/admin/kanban/PhasesViewToggle";
@@ -34,7 +33,6 @@ export default async function ProjectDetailPage({
     payments,
     documents,
     notes,
-    comments,
     activeTimerEntryId,
     activeTimerStartedAt,
     totalTrackedSeconds,
@@ -72,7 +70,6 @@ export default async function ProjectDetailPage({
           <TabsTrigger value="payments">Pagamenti</TabsTrigger>
           <TabsTrigger value="documents">Documenti</TabsTrigger>
           <TabsTrigger value="notes">Note</TabsTrigger>
-          <TabsTrigger value="comments">Commenti</TabsTrigger>
           <TabsTrigger value="timer">Timer</TabsTrigger>
           <TabsTrigger value="offers">Offerte</TabsTrigger>
         </TabsList>
@@ -115,10 +112,6 @@ export default async function ProjectDetailPage({
           </div>
         </TabsContent>
 
-        <TabsContent value="comments">
-          <CommentsTab comments={comments} phases={phases} clientId={id} />
-        </TabsContent>
-
         <TabsContent value="timer">
           <TimerTab
             projectId={id}
diff --git a/src/app/admin/projects/page.tsx b/src/app/admin/projects/page.tsx
index aaaa7bc..f96619a 100644
--- a/src/app/admin/projects/page.tsx
+++ b/src/app/admin/projects/page.tsx
@@ -44,7 +44,6 @@ export default async function ProjectsPage() {
                   <th className="py-4 px-6 text-right">Valore Totale</th>
                   <th className="py-4 px-6 text-center">Acconto</th>
                   <th className="py-4 px-6 text-center">Saldo</th>
-                  <th className="py-4 px-6 text-center">Timer</th>
                   <th className="py-4 px-6 text-right">Redditività (€/H)</th>
                 </tr>
               </thead>
diff --git a/src/components/admin/ProjectRow.tsx b/src/components/admin/ProjectRow.tsx
index af448ae..076cc6e 100644
--- a/src/components/admin/ProjectRow.tsx
+++ b/src/components/admin/ProjectRow.tsx
@@ -1,5 +1,4 @@
 import Link from "next/link";
-import { TimerCell } from "@/components/admin/TimerCell";
 import type { ProjectWithPayments } from "@/lib/admin-queries";
 
 const statusConfig: Record<string, { label: string; className: string }> = {
@@ -80,18 +79,6 @@ export function ProjectRow({ project }: { project: ProjectWithPayments }) {
         )}
       </td>
 
-      <td className="py-4 px-6">
-        <div className="flex justify-center">
-          <TimerCell
-            clientId={project.id}
-            projectId={project.id}
-            activeEntryId={project.activeTimerEntryId}
-            activeStartedAt={project.activeTimerStartedAt}
-            totalTrackedSeconds={project.totalTrackedSeconds}
-          />
-        </div>
-      </td>
-
       <td className="py-4 px-6 text-right whitespace-nowrap">
         {eurPerHour === null ? (
           <span className="text-muted-foreground/40 font-medium">—</span>
diff --git a/src/components/admin/tabs/CommentsTab.tsx b/src/components/admin/tabs/CommentsTab.tsx
deleted file mode 100644
index 41666f5..0000000
--- a/src/components/admin/tabs/CommentsTab.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { postAdminComment } from "@/app/admin/clients/[id]/actions";
-import { Button } from "@/components/ui/button";
-import { Textarea } from "@/components/ui/textarea";
-import type { Comment } from "@/db/schema";
-import type { ClientFullDetail } from "@/lib/admin-queries";
-
-type Props = {
-  comments: Comment[];
-  phases: ClientFullDetail["phases"];
-  clientId: string;
-};
-
-export async function CommentsTab({ comments, phases, clientId }: Props) {
-  // Build entity label map for display (phases, tasks, deliverables, and general)
-  const entityLabels: Record<string, string> = {
-    [clientId]: "Messaggio generale",
-  };
-  for (const phase of phases) {
-    entityLabels[phase.id] = `Fase: ${phase.title}`;
-    for (const task of phase.tasks) {
-      entityLabels[task.id] = `Task: ${task.title}`;
-      for (const d of task.deliverables) {
-        entityLabels[d.id] = `Deliverable: ${d.title}`;
-      }
-    }
-  }
-
-  // Build list of entities the admin can reply on
-  const entities: Array<{ id: string; type: string; label: string }> = [
-    { id: clientId, type: "general", label: "Messaggio generale" },
-  ];
-  for (const phase of phases) {
-    entities.push({ id: phase.id, type: "phase", label: `Fase: ${phase.title}` });
-    for (const task of phase.tasks) {
-      entities.push({ id: task.id, type: "task", label: `Task: ${task.title}` });
-      for (const d of task.deliverables) {
-        entities.push({
-          id: d.id,
-          type: "deliverable",
-          label: `Deliverable: ${d.title}`,
-        });
-      }
-    }
-  }
-
-  return (
-    <div className="space-y-6 max-w-lg">
-      {/* Comment list */}
-      {comments.length === 0 && (
-        <p className="text-sm text-gray-400">Nessun commento ancora.</p>
-      )}
-      <div className="space-y-3">
-        {comments.map((c) => (
-          <div
-            key={c.id}
-            className={`flex gap-3 ${c.author === "admin" ? "flex-row-reverse" : ""}`}
-          >
-            <div
-              className={`rounded-lg px-3 py-2 text-sm max-w-xs ${
-                c.author === "admin"
-                  ? "bg-gray-900 text-white"
-                  : "bg-white border border-gray-200 text-gray-800"
-              }`}
-            >
-              <p className="text-xs font-medium mb-1 opacity-60">
-                {c.author === "admin" ? "iamcavalli" : "Cliente"} —{" "}
-                {entityLabels[c.entity_id] ?? c.entity_id}
-              </p>
-              <p>{c.body}</p>
-            </div>
-          </div>
-        ))}
-      </div>
-
-      {/* Admin reply form */}
-      <form
-        action={async (fd: FormData) => {
-          "use server";
-          await postAdminComment(clientId, fd);
-        }}
-        className="bg-white border border-gray-200 rounded-lg p-4 space-y-3"
-      >
-        <h3 className="font-medium text-gray-900 text-sm">
-          Rispondi come admin
-        </h3>
-        <select
-          name="entity"
-          className="w-full text-sm border border-gray-200 rounded px-2 py-1.5 bg-white"
-          required
-        >
-          {entities.map((e) => (
-            <option key={e.id} value={`${e.type}:${e.id}`}>
-              {e.label}
-            </option>
-          ))}
-        </select>
-        <Textarea
-          name="body"
-          placeholder="Scrivi un commento..."
-          rows={3}
-          required
-        />
-        <Button type="submit" size="sm">
-          Invia risposta
-        </Button>
-      </form>
-    </div>
-  );
-}
diff --git a/src/lib/admin-queries.ts b/src/lib/admin-queries.ts
index 02fb457..e4fcde0 100644
--- a/src/lib/admin-queries.ts
+++ b/src/lib/admin-queries.ts
@@ -477,8 +477,8 @@ export type ProjectWithPayments = {
   archived: boolean;
   created_at: Date;
   payments: Array<{ id: string; label: string; status: string; amount: string }>;
-  activeTimerEntryId: string | null;
-  activeTimerStartedAt: Date | null;
+  // Niente timer attivo qui: la lista non lo mostra più, si avvia e si ferma
+  // dentro il progetto. `totalTrackedSeconds` resta perché serve al €/h.
   totalTrackedSeconds: number;
 };
 
@@ -506,21 +506,12 @@ export async function getAllProjectsWithPayments(
   const projectIds = visible.map((p) => p.id);
   const clientIds = [...new Set(visible.map((p) => p.client_id))];
 
-  const [allPayments, activeEntries, totals, parentClients] = await Promise.all([
+  const [allPayments, totals, parentClients] = await Promise.all([
     db
       .select()
       .from(payments)
       .where(inArray(payments.project_id, projectIds)),
 
-    db
-      .select({
-        id: time_entries.id,
-        project_id: time_entries.project_id,
-        started_at: time_entries.started_at,
-      })
-      .from(time_entries)
-      .where(isNull(time_entries.ended_at)),
-
     db
       .select({
         project_id: time_entries.project_id,
@@ -538,7 +529,6 @@ export async function getAllProjectsWithPayments(
 
   return visible.map((project) => {
     const projectPayments = allPayments.filter((p) => p.project_id === project.id);
-    const activeEntry = activeEntries.find((e) => e.project_id === project.id);
     const totalRow = totals.find((t) => t.project_id === project.id);
     const parentClient = parentClients.find((c) => c.id === project.client_id);
 
@@ -555,8 +545,6 @@ export async function getAllProjectsWithPayments(
         status: p.status,
         amount: String(p.amount),
       })),
-      activeTimerEntryId: activeEntry?.id ?? null,
-      activeTimerStartedAt: activeEntry?.started_at ?? null,
       totalTrackedSeconds: totalRow ? parseInt(totalRow.total) : 0,
     };
   });
@@ -570,7 +558,8 @@ export type ProjectFullDetail = {
   payments: Payment[];
   documents: Document[];
   notes: Note[];
-  comments: Comment[];
+  // I commenti NON stanno qui: si leggono e si risponde da /admin/conversazioni,
+  // che li aggrega per cliente con l'etichetta dell'entità di origine.
   quoteItems: QuoteItemWithLabel[];
   activeServices: Service[];
   activeTimerEntryId: string | null;
@@ -734,16 +723,6 @@ export async function getProjectFullDetail(id: string): Promise<ProjectFullDetai
         .orderBy(desc(clientTranscripts.call_date)),
     ]);
 
-  const allEntityIds = [id, ...taskIds, ...deliverablesRows.map((d) => d.id)];
-  const commentsRows =
-    allEntityIds.length === 0
-      ? []
-      : await db
-          .select()
-          .from(comments)
-          .where(inArray(comments.entity_id, allEntityIds))
-          .orderBy(asc(comments.created_at));
-
   const phasesWithTasks = phasesRows.map((phase) => ({
     ...phase,
     tasks: tasksRows
@@ -780,7 +759,6 @@ export async function getProjectFullDetail(id: string): Promise<ProjectFullDetai
     payments: paymentsRows,
     documents: documentsRows,
     notes: notesRows,
-    comments: commentsRows,
     quoteItems: quoteItemRows as QuoteItemWithLabel[],
     activeServices: activeServiceRows,
     activeTimerEntryId: activeEntryRows[0]?.id ?? null,