diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index 12cf85a..78f0d36 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     'name': 'Improved Field Service Management',
-    'version': '15.0.1.0.8',
+    'version': '15.0.1.0.9',
     'summary': 'Adds functionality necessary for managing field service operations at Durpro.',
     'description': 'Adds functionality necessary for managing field service operations at Durpro.',
     'category': 'Services/Field Service',
@@ -56,11 +56,6 @@
         'wizard/new_task_from_template.xml',
     ],
     'assets': {
-        'web.assets_tests': [
-            'bemade_fsm/static/tests/tours/task_template_tour.js',
-            'bemade_fsm/static/tests/tours/equipment_tour.js',
-            'bemade_fsm/static/tests/tours/sale_order_tour.js',
-        ],
         'web.report_assets_common': [
             'bemade_fsm/static/src/scss/bemade_fsm.scss'
         ],
diff --git a/bemade_fsm/reports/worksheet_custom_report_templates.xml b/bemade_fsm/reports/worksheet_custom_report_templates.xml
index 192455a..7436646 100644
--- a/bemade_fsm/reports/worksheet_custom_report_templates.xml
+++ b/bemade_fsm/reports/worksheet_custom_report_templates.xml
@@ -242,6 +242,20 @@
                     </t>
                 </div>
             </div>
+            <div class="row" t-if="doc.planned_date_begin or doc.planned_date_end">
+                <div t-attf-class="{{'col-6' if report_type == 'pdf' else 'col-md-6 col-12'}}">
+                    <div t-if="doc.planned_date_begin"><h6>Planned start: </h6></div>
+                    <div class="mb-3">
+                        <div t-out="doc.planned_date_begin.strftime('%Y-%m-%d %H:%M')" />
+                    </div>
+                </div>
+                <div t-attf-class="{{'col-6' if report_type == 'pdf' else 'col-md-6 col-12'}}">
+                    <div t-if="doc.planned_date_end"><h6>Planned end: </h6></div>
+                    <div class="mb-3">
+                        <div t-out="doc.planned_date_end.strftime('%Y-%m-%d %H:%M')"/>
+                    </div>
+                </div>
+            </div>
             <div class="row">
                 <div t-attf-class="{{'col-6' if report_type == 'pdf' else 'col-md-6 col-12'}}">
                     <div t-if="doc.site_contacts"><h6>Site Contacts: </h6></div>
diff --git a/bemade_fsm/reports/worksheet_templates.xml b/bemade_fsm/reports/worksheet_templates.xml
deleted file mode 100644
index 026f037..0000000
--- a/bemade_fsm/reports/worksheet_templates.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <data>
-        <record id="default_worksheet_template" model="ir.actions.report">
-            <field name="name">Complete Worksheet Report (PDF)</field>
-            <field name="model">project.task</field>
-            <field name="report_type">qweb-pdf</field>
-            <field name="report_name">bemade_fsm.worksheet_complete</field>
-            <field name="print_report_name">
-                '%s Worksheet %s' % (time.strftime('%Y-%m-%d'), object.name)
-            </field>
-            <field name="binding_model_id" ref="model_project_task"/>
-            <field name="binding_type">report</field>
-        </record>
-
-        <template id="worksheet_complete">
-            <t t-call="web.html_container">
-                <t t-foreach="docs" t-as="doc">
-                    <t t-call="bemade_fsm.worksheet_complete_page"
-                       t-lang="doc.partner_id.lang"/>
-                </t>
-            </t>
-        </template>
-
-        <template id="worksheet_complete_page">
-            <t t-call="web.external_layout">
-                <t t-set="address" t-if="doc.sale_order_id">
-                    <strong class="big-red">Customer:</strong>
-                    <div t-field="doc.sale_order_id.partner_id"
-                         t-options='{"widget": "contact",
-                                "fields": ["address", "name"], "no_marker": True}'/>
-                </t>
-                <t t-set="information_block">
-                    <strong>Service Address:</strong>
-                    <div t-field="doc.partner_id"
-                         t-options='{"widget": "contact",
-                                 "fields": ["address", "name", "phone"],
-                                 "no_marker": True, "phone_icons": True}'/>
-                </t>
-                <div class="page">
-                    <div class="oe_structure"/>
-                    <h2 class="mt-3">
-                        <span>Work Order </span>
-                        <span t-if="doc.sale_order_id" t-field="doc.sale_order_id.name"/>
-                        <span t-else="" t-field="doc.name"/>
-                    </h2>
-                    <div class="container">
-                        <div class="row mb-3 border-dark">
-                            <div t-if="doc.sale_order_id.client_order_ref" class="col-4">
-                                <span class="font-weight-bolder">Your Reference:</span>
-                                <span t-field="doc.sale_order_id.client_order_ref"/>
-                            </div>
-                            <div t-if="doc.site_contacts" class="col-4">
-                                <span class="font-weight-bolder">Site Contacts:</span>
-                                <t t-foreach="doc.site_contacts" t-as="contact">
-                                    <span t-field="contact.name"/>
-                                    <span t-out="contact"
-                                          t-options='{"widget": "contact",
-                                         "fields": ["phone", "mobile", "email"],
-                                         "no_marker": True, "phone_icons": True}'/>
-                                </t>
-                            </div>
-                            <div t-if="doc.work_order_contacts" class="col-4">
-                                <span class="font-weight-bolder">Work order attn:</span>
-                                <t t-foreach="doc.work_order_contacts" t-as="contact">
-                                    <span t-field="contact.name"/>
-                                    <span t-out="contact"
-                                          t-options='{"widget": "contact",
-                                         "fields": ["phone", "mobile", "email"],
-                                         "no_marker": True, "phone_icons": True}'/>
-                                </t>
-                            </div>
-                        </div>
-                        <div class="row mb-3 border-dark">
-                            <div class="col-4" t-if="doc.user_ids">
-                                <span class="font-weight-bolder">Technician(s)</span>
-                                <t t-foreach="doc.user_ids" t-as="technician">
-                                    <p class="m-0" t-field="technician.name"/>
-                                </t>
-                            </div>
-                            <div class="col-4" t-if="doc.planned_date_begin">
-                                <span class="font-weight-bolder">Planned Start</span>
-                                <p t-field="doc.planned_date_begin"
-                                   t-options="{'widget': 'datetime'}"/>
-                            </div>
-                            <div class="col-4" t-if="doc.planned_date_end">
-                                <span class="font-weight-bolder">Planned End</span>
-                                <p t-field="doc.planned_date_end"
-                                   t-options="{'widget': 'datetime'}"/>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="container">
-                        <h3 class="mb32"><strong>Interventions</strong></h3>
-                        <t t-foreach="doc.child_ids" t-as="intervention">
-                            <div class="row">
-                                <div class="col-6">
-                                    <h4><span t-field="intervention.name"/></h4>
-                                        <span t-if="intervention.description"
-                                              t-field="intervention.description"/>
-                                </div>
-                                <div t-if="intervention.equipment_ids"
-                                     class="col-6">
-                                    <h4>Equipment: </h4>
-                                    <t t-foreach="intervention.equipment_ids"
-                                       t-as="equipment">
-                                        <span t-field="equipment.complete_name"/>
-                                        <span t-if="equipment_index &lt; equipment_size -1"
-                                              t-out="', '"/>
-                                    </t>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <table class="table table-borderless col-12">
-                                    <thead>
-                                        <th>Done</th>
-                                        <th>Task to do</th>
-                                    </thead>
-                                    <tbody>
-                                        <t t-foreach="intervention.child_ids"
-                                           t-as="task">
-                                            <tr class="wo-task">
-                                                <td style="width: 5%">
-                                                    <input type="checkbox"
-                                                           t-att-checked="task.is_complete"/>
-                                                </td>
-                                                <td style="width: 95%">
-                                                    <p t-field="task.name"/>
-                                                    <p t-field="task.description"/>
-                                                </td>
-                                                <!-- TODO: Figure out what to do with the old
-                                                           concept of task comments -->
-                                            </tr>
-                                        </t>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </t>
-                    </div>
-                </div>
-            </t>
-        </template>
-
-    </data>
-</odoo>
\ No newline at end of file