diff -r ca6888533036 -r f6bab82b8f30 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 15:08:41 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 15:11:50 2010 +0100
@@ -7899,9 +7899,6 @@
 <component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
 <unit bldFile="app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
 </component>
-<component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
-<unit bldFile="app/organizer/calendarui/caldav/group"/>
-</component>
 </collection>
 <collection name="notes" long-name="Notes" level="ui">
 <component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
@@ -7924,9 +7921,6 @@
 <component name="calenimp" filter="s60" long-name="Calendar Import Wrapper" introduced="7.0s">
 <unit bldFile="app/organizer/calendarengines/calenimp/group"/>
 </component>
-<component name="caldavsrv" filter="sf_build" long-name="CalDAV Server" introduced="^3">
-<unit bldFile="app/organizer/calendarengines/caldav/group"/>
-</component>
 </collection>
 <collection name="clock" long-name="Clock" level="app">
 <!-- uncomment unit when block_build is split up-->