diff --git a/calendar/inc/class.calendarmenu.inc.php b/calendar/inc/class.calendarmenu.inc.php
deleted file mode 100755
index ef6a951d61..0000000000
--- a/calendar/inc/class.calendarmenu.inc.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar                                                    *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * Modified by Mark Peters <skeeter@phpgroupware.org>                       *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	class calendarmenu
-	{
-
-
-		function calendarmenu()
-		{
-			$menu = Array();
-			$menu['File'] = Array(
-				'New Entry'   => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.add'),
-				'Export'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.export'),
-				'Import'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import')
-				);
-				
-			$menu['View'] = Array(
-				'Today'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.day'),
-				'This week'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.week'),
-				'This month'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.month'),
-				'This year'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.year'),
-				'Group Planner'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.planner'),
-				'Daily Matrix'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.matrixselect')
-				);
-				
-			$menu['Preferences'] = Array(
-				'Calendar preferences'=>$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=calendar'),
-				'Grant Access'=>$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app=calendar'),
-				'Edit Categories' => $GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=calendar&cats_level=True&global_cats=True')
-				);
-			
-			if ($GLOBALS['phpgw_info']['user']['apps']['admin']) {
-				$menu['Administration'] = Array(
-					'Configuration'=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
-					'Custom Fields'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
-					'Holiday Management'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
-					'Import CSV-File' => $GLOBALS['phpgw']->link('/calendar/csv_import.php'),
-					'Global Categories' =>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')
-					);
-			}
-		
-		
-			return $menu;
-		}
-		
-	}	
-?>
diff --git a/calendar/inc/class.calendernotify.inc.php b/calendar/inc/class.calendernotify.inc.php
deleted file mode 100755
index 7f8c344a91..0000000000
--- a/calendar/inc/class.calendernotify.inc.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Calendar Notify Hook                                        *
-  * http://www.egroupware.org                                                *
-  * Based on Webcalendar by Craig Knudsen <cknudsen@radix.net>               *
-  *          http://www.radix.net/~cknudsen                                  *
-  * File created by Edo van Bruggen <edovanbruggen@raketnet.nl>              *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-
-	class calendernotify
-	{
-
-
-		function notify()
-		{
-			$db;
-			$table = 'phpgw_cal';
-			$owner;
-			$this->db    = $GLOBALS['phpgw']->db;
-			$this->owner = $GLOBALS['phpgw_info']['user']['account_id'];
-			$config = CreateObject('phpgwapi.config');
-			$config->read_repository();
-			$GLOBALS['phpgw_info']['server']['calendar'] = $config->config_data;
-			unset($config);
-			$messages = array();
-			$count = 0;
-			$time = time();
-			$date_new = time()+ 604800;
-			$this->db->limit_query('SELECT * FROM `'. $table .'` WHERE  cal_owner =\''
-				. $this->owner.'\' ',"",__LINE__,__FILE__);
-			
-			while($this->db->next_record())
-			{
-				if($this->db->f('cal_starttime') - $time < 604800 and $this->db->f('cal_starttime') - $time > 0)
-				{
-					$count++;
-				}
-			}
-			if($count > 0)
-			{
-				if($count == 1)
-				{
-					return "You have ".$count." new appointment.";
-				}
-				else
-				{
-					return "You have ".$count." new appointments.";
-				}
-				
-			}
-			return  False;
-
-		}
-	}	
-?>
diff --git a/calendar/inc/class.socal.inc.php b/calendar/inc/class.socal.inc.php
index 924a8070bf..18f0abe0de 100644
--- a/calendar/inc/class.socal.inc.php
+++ b/calendar/inc/class.socal.inc.php
@@ -49,7 +49,7 @@ define('ACCEPTED',3);
  * Tables used by socal:
  *	- egw_cal: general calendar data: cal_id, title, describtion, locations, ...
  *	- egw_cal_dates: start- and enddates (multiple entry per cal_id for recuring events!)
- *	- egw_cal_users: participant info including status (multiple entries per cal_id AND startdate for recuring events)
+ *	- egw_cal_user: participant info including status (multiple entries per cal_id AND startdate for recuring events)
  * 	- egw_cal_repeats: recur-data: type, optional enddate, etc.
  *  - egw_cal_extra: custom fields (multiple entries per cal_id possible)
  *