diff --git a/include/class.template.php b/include/class.template.php
index 18c04548731719bcc09a169d50f0d639dc437a8c..f3a459f6de0855b27c0aca7647107d2733e8481e 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -161,8 +161,7 @@ class EmailTemplateGroup {
         'task.overdue.alert'=>array(
             'group'=>'c.task',
             'name'=>/* @trans */ 'Overdue Task Alert',
-            'desc'=>/* @trans */ 'Alert sent to agents on stale or overdue
-            task.',
+            'desc'=>/* @trans */ 'Alert sent to agents on stale or overdue task.',
         ),
     );
 
diff --git a/include/class.thread.php b/include/class.thread.php
index 7572ffdd59047d5bf993aa900627f1f211d28941..e5a78cde2258b6980add5bd495b766ad5a4dbbd1 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -499,6 +499,9 @@ class Thread extends VerySimpleModel {
 
         $this->entries->delete();
 
+        // Null out the events
+        $this->events->update(array('thread_id' => 0));
+
         return true;
     }
 
diff --git a/include/class.ticket.php b/include/class.ticket.php
index ff6c549e4dc5a3a8956cbd453e182a5c6285a7aa..3a48f7db8f3249d0cff914c4c15acbf2270fc726 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -144,14 +144,6 @@ class TicketModel extends VerySimpleModel {
          ));
     }
 
-    function delete() {
-
-        if (($ticket=Ticket::lookup($this->getId())) && @$ticket->delete())
-            return true;
-
-        return false;
-    }
-
     static function registerCustomData(DynamicForm $form) {
         if (!isset(static::$meta['joins']['cdata+'.$form->id])) {
             $cdata_class = <<<EOF