diff --git a/src/routes/cases.$caseId.tsx b/src/routes/cases.$caseId.tsx
index 19aecdb..27741b1 100644
--- a/src/routes/cases.$caseId.tsx
+++ b/src/routes/cases.$caseId.tsx
@@ -18,7 +18,6 @@ import { CaseInvoicesTab } from "@/components/cases/invoices-tab";
 import { CaseLitigationTab } from "@/components/cases/litigation-tab";
 import { toast } from "sonner";
 import { useAuth } from "@/lib/auth";
-import { StartTimerButton } from "@/components/timer/start-timer-button";
 
 export const Route = createFileRoute("/cases/$caseId")({
   component: () => (
@@ -106,41 +105,27 @@ function CaseDetail() {
             {" · "}{data.practice_area || "—"}{" · "}opened {formatDate(data.opened_at)}
           </p>
         </div>
-        <div className="flex flex-wrap gap-2">
-          <StartTimerButton
-            size="sm"
-            variant="outline"
-            target={{
-              clientId: data.client.id,
-              clientName: data.client.name,
-              caseId: data.id,
-              caseNumber: data.case_number,
-              caseTitle: data.title,
-              defaultHourlyRate: data.default_hourly_rate,
-            }}
-          />
-          {canManage && (
-            <>
-              <Select value={data.assigned_attorney_id ?? ""} onValueChange={updateAssignee}>
-                <SelectTrigger className="w-[200px]"><SelectValue placeholder="Assign attorney" /></SelectTrigger>
-                <SelectContent>
-                  {users.map((u) => <SelectItem key={u.id} value={u.id}>{u.full_name || u.email}</SelectItem>)}
-                </SelectContent>
-              </Select>
-              <Select value={data.status} onValueChange={updateStatus}>
-                <SelectTrigger className="w-[160px]"><SelectValue /></SelectTrigger>
-                <SelectContent>
-                  <SelectItem value="intake">Intake</SelectItem>
-                  <SelectItem value="active">Active</SelectItem>
-                  <SelectItem value="on_hold">On hold</SelectItem>
-                  <SelectItem value="closed_won">Closed — won</SelectItem>
-                  <SelectItem value="closed_lost">Closed — lost</SelectItem>
-                  <SelectItem value="closed">Closed</SelectItem>
-                </SelectContent>
-              </Select>
-            </>
-          )}
-        </div>
+        {canManage && (
+          <div className="flex flex-wrap gap-2">
+            <Select value={data.assigned_attorney_id ?? ""} onValueChange={updateAssignee}>
+              <SelectTrigger className="w-[200px]"><SelectValue placeholder="Assign attorney" /></SelectTrigger>
+              <SelectContent>
+                {users.map((u) => <SelectItem key={u.id} value={u.id}>{u.full_name || u.email}</SelectItem>)}
+              </SelectContent>
+            </Select>
+            <Select value={data.status} onValueChange={updateStatus}>
+              <SelectTrigger className="w-[160px]"><SelectValue /></SelectTrigger>
+              <SelectContent>
+                <SelectItem value="intake">Intake</SelectItem>
+                <SelectItem value="active">Active</SelectItem>
+                <SelectItem value="on_hold">On hold</SelectItem>
+                <SelectItem value="closed_won">Closed — won</SelectItem>
+                <SelectItem value="closed_lost">Closed — lost</SelectItem>
+                <SelectItem value="closed">Closed</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+        )}
       </div>
 
       {data.description && (
diff --git a/src/routes/clients.$clientId.tsx b/src/routes/clients.$clientId.tsx
index 9102758..72ec9d9 100644
--- a/src/routes/clients.$clientId.tsx
+++ b/src/routes/clients.$clientId.tsx
@@ -10,7 +10,6 @@ import { ClientFormDialog } from "@/components/clients/client-form-dialog";
 import { useAuth } from "@/lib/auth";
 import { ArrowLeft, Edit, Plus, Building2, User, Briefcase as Building, MapPin, Mail, Phone, Users } from "lucide-react";
 import { formatDate, statusBadgeClass } from "@/lib/format";
-import { StartTimerButton } from "@/components/timer/start-timer-button";
 import { toast } from "sonner";
 
 export const Route = createFileRoute("/clients/$clientId")({
@@ -80,11 +79,6 @@ function ClientDetail() {
         description={client.management_company || client.client_type.toUpperCase()}
         actions={
           <>
-            <StartTimerButton
-              variant="outline"
-              target={{ clientId: client.id, clientName: client.name }}
-              label="Start client timer"
-            />
             {canEdit && (
               <Button variant="outline" onClick={() => setEditOpen(true)}>
                 <Edit className="h-4 w-4 mr-2" /> Edit