diff --git a/calendar/day.php b/calendar/day.php
index ca681d67b5..804c143ea6 100644
--- a/calendar/day.php
+++ b/calendar/day.php
@@ -1,4 +1,3 @@
-<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
diff --git a/calendar/delete.php b/calendar/delete.php
index e96667b36b..d84bddac40 100755
--- a/calendar/delete.php
+++ b/calendar/delete.php
@@ -1,4 +1,3 @@
-<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
@@ -13,7 +12,7 @@
   \**************************************************************************/
 
   /* $Id$ */
-  $phpgw_info["flags"] = array("currentapp" => "calendar", "noheader" => True, "nonavbar" => True, "enable_nextmatchs_class" => True);
+  $phpgw_info["flags"] = array("currentapp" => "calendar", "noheader" => True, "nonavbar" => True);
   include("../header.inc.php");
 
   if ($id > 0) {
@@ -23,7 +22,7 @@
      $thisyear = intval($phpgw->common->show_date($phpgw->db->f("cal_datetime"),"Y"));
      $thismonth = intval($phpgw->common->show_date($phpgw->db->f("cal_datetime"),"n"));
 
-     $phpgw->calendar->delete($id);
+     $phpgw->calendar->delete(intval($id));
   }
 
   Header("Location: " . $phpgw->link("index.php","year=$thisyear&month=$thismonth"));
diff --git a/calendar/search.php b/calendar/search.php
index dd144c717c..3efc47e0aa 100755
--- a/calendar/search.php
+++ b/calendar/search.php
@@ -1,4 +1,3 @@
-<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *
diff --git a/calendar/week.php b/calendar/week.php
index 27526f0b6f..afa37dc192 100755
--- a/calendar/week.php
+++ b/calendar/week.php
@@ -1,4 +1,3 @@
-<?php_track_vars?>
 <?php
   /**************************************************************************\
   * phpGroupWare - Calendar                                                  *