diff --git a/fusion-plating/fusion_tasks/static/src/js/fusion_task_map_view.js b/fusion-plating/fusion_tasks/static/src/js/fusion_task_map_view.js
index 38bec401..a86e711e 100644
--- a/fusion-plating/fusion_tasks/static/src/js/fusion_task_map_view.js
+++ b/fusion-plating/fusion_tasks/static/src/js/fusion_task_map_view.js
@@ -232,15 +232,14 @@ function groupTasks(tasksData, localInstanceId, visibleTechIds) {
         task._statusColor = STATUS_COLORS[task.status] || "#6b7280";
         task._statusLabel = STATUS_LABELS[task.status] || task.status || "";
         task._statusIcon = STATUS_ICONS[task.status] || "fa-circle";
-        task._clientName = task.x_fc_sync_client_name || (task.partner_id ? task.partner_id[1] : "N/A");
+        task._clientName = task.partner_id ? task.partner_id[1] : "N/A";
         task._techName = task.technician_id ? task.technician_id[1] : "Unassigned";
         task._typeLbl = task.task_type
             ? task.task_type.charAt(0).toUpperCase() + task.task_type.slice(1).replace("_", " ")
             : "Task";
         task._timeRange = `${task.time_start_display || floatToTime12(task.time_start)} - ${task.time_end_display || ""}`;
-        const src = task.x_fc_sync_source || localInstanceId || "";
-        task._sourceLabel = src ? src.charAt(0).toUpperCase() + src.slice(1) : "";
-        task._sourceColor = SOURCE_COLORS[src] || "#6c757d";
+        task._sourceLabel = "";
+        task._sourceColor = "#6c757d";
         task._dateLabel = task.scheduled_date
             ? new Date(task.scheduled_date + "T12:00:00").toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric' })
             : "No date";
diff --git a/fusion-plating/fusion_tasks/views/technician_task_views.xml b/fusion-plating/fusion_tasks/views/technician_task_views.xml
index 0406458a..7a67aa52 100644
--- a/fusion-plating/fusion_tasks/views/technician_task_views.xml
+++ b/fusion-plating/fusion_tasks/views/technician_task_views.xml
@@ -63,14 +63,9 @@
                 <filter string="My Tasks" name="filter_my_tasks"
                         domain="['|', ('technician_id', '=', uid), ('additional_technician_ids', 'in', [uid])]"/>
                 <filter string="Deliveries" name="filter_deliveries" domain="[('task_type', '=', 'delivery')]"/>
-                <filter string="Repairs" name="filter_repairs" domain="[('task_type', '=', 'repair')]"/>
+                <filter string="Pickups" name="filter_pickups" domain="[('task_type', '=', 'pickup')]"/>
                 <filter string="POD Required" name="filter_pod" domain="[('pod_required', '=', True)]"/>
                 <separator/>
-                <filter string="Local Tasks" name="filter_local"
-                        domain="[('x_fc_sync_source', '=', False)]"/>
-                <filter string="Synced Tasks" name="filter_synced"
-                        domain="[('x_fc_sync_source', '!=', False)]"/>
-                <separator/>
                 <!-- Group By -->
                 <filter string="Technician" name="group_technician" context="{'group_by': 'technician_id'}"/>
                 <filter string="Date" name="group_date" context="{'group_by': 'scheduled_date'}"/>
@@ -89,44 +84,32 @@
         <field name="model">fusion.technician.task</field>
         <field name="arch" type="xml">
             <form string="Technician Task">
-                <field name="x_fc_is_shadow" invisible="1"/>
-                <field name="x_fc_sync_source" invisible="1"/>
                 <header>
                     <button name="action_start_en_route" type="object" string="En Route"
-                            class="btn-primary" invisible="status != 'scheduled' or x_fc_is_shadow"/>
+                            class="btn-primary" invisible="status != 'scheduled'"/>
                     <button name="action_start_task" type="object" string="Start Task"
-                            class="btn-primary" invisible="status not in ('scheduled', 'en_route') or x_fc_is_shadow"/>
+                            class="btn-primary" invisible="status not in ('scheduled', 'en_route')"/>
                     <button name="action_complete_task" type="object" string="Complete"
-                            class="btn-success" invisible="status not in ('in_progress', 'en_route') or x_fc_is_shadow"/>
+                            class="btn-success" invisible="status not in ('in_progress', 'en_route')"/>
                     <button name="action_reschedule" type="object" string="Reschedule"
-                            class="btn-warning" invisible="status not in ('scheduled', 'en_route') or x_fc_is_shadow"/>
+                            class="btn-warning" invisible="status not in ('scheduled', 'en_route')"/>
                     <button name="action_cancel_task" type="object" string="Cancel"
-                            class="btn-danger" invisible="status in ('completed', 'cancelled') or x_fc_is_shadow"
+                            class="btn-danger" invisible="status in ('completed', 'cancelled')"
                             confirm="Are you sure you want to cancel this task?"/>
                     <button name="action_reset_to_scheduled" type="object" string="Reset to Scheduled"
-                            invisible="status not in ('cancelled', 'rescheduled') or x_fc_is_shadow"/>
+                            invisible="status not in ('cancelled', 'rescheduled')"/>
                     <button string="Calculate Travel"
-                            class="btn-secondary o_fc_calculate_travel" icon="fa-car"
-                            invisible="x_fc_is_shadow"/>
+                            class="btn-secondary o_fc_calculate_travel" icon="fa-car"/>
                     <field name="status" widget="statusbar"
                            statusbar_visible="pending,scheduled,en_route,in_progress,completed"/>
                 </header>
                 <sheet>
-                    <!-- Shadow task banner -->
-                    <div class="alert alert-info text-center" role="alert"
-                         invisible="not x_fc_is_shadow">
-                        <strong><i class="fa fa-link"/> This task is synced from
-                        <field name="x_fc_sync_source" readonly="1" nolabel="1" class="d-inline"/>
-                        — view only.</strong>
-                    </div>
                     <div class="oe_button_box" name="button_box">
                     </div>
                     <widget name="web_ribbon" title="Completed" bg_color="text-bg-success"
                             invisible="status != 'completed'"/>
                     <widget name="web_ribbon" title="Cancelled" bg_color="text-bg-danger"
                             invisible="status != 'cancelled'"/>
-                    <widget name="web_ribbon" title="Synced" bg_color="text-bg-info"
-                            invisible="not x_fc_is_shadow or status in ('completed', 'cancelled')"/>
                     <div class="oe_title">
                         <h1>
                             <field name="name" readonly="1"/>
@@ -260,9 +243,6 @@
                        decoration-danger="status == 'cancelled'"/>
                 <field name="priority" widget="priority" optional="hide"/>
                 <field name="pod_required" optional="hide"/>
-                <field name="x_fc_source_label" string="Source" optional="show"
-                       widget="badge" decoration-info="x_fc_is_shadow"
-                       decoration-success="not x_fc_is_shadow"/>
             </list>
         </field>
     </record>
@@ -288,8 +268,6 @@
                 <field name="address_city"/>
                 <field name="travel_time_minutes"/>
                 <field name="status"/>
-                <field name="x_fc_is_shadow"/>
-                <field name="x_fc_sync_client_name"/>
                 <templates>
                     <t t-name="card">
                         <div t-attf-class="oe_kanban_color_#{record.color.raw_value} oe_kanban_card oe_kanban_global_click">
@@ -308,12 +286,7 @@
                                 </div>
                                 <div class="mb-1">
                                     <i class="fa fa-user me-1"/>
-                                    <t t-if="record.x_fc_is_shadow.raw_value">
-                                        <span t-out="record.x_fc_sync_client_name.value"/>
-                                    </t>
-                                    <t t-else="">
-                                        <field name="partner_id"/>
-                                    </t>
+                                    <field name="partner_id"/>
                                 </div>
                                 <div class="text-muted small" t-if="record.address_city.raw_value">
                                     <i class="fa fa-map-marker me-1"/><field name="address_city"/>
@@ -354,7 +327,6 @@
                       quick_create="0">
                 <!-- Displayed on the calendar card -->
                 <field name="partner_id"/>
-                <field name="x_fc_sync_client_name"/>
                 <field name="task_type"/>
                 <field name="time_start_display" string="Start"/>
                 <field name="time_end_display" string="End"/>