diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
deleted file mode 100644
index eeffbe28c0..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		_value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		_value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
deleted file mode 100644
index decd499293..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"
-		type="exe"
-		location="rdf-summary">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Factory for the RDF summary."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="RDF Summary"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
deleted file mode 100644
index b0c9e8f0d6..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
+++ /dev/null
@@ -1,53 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component"
-		type="factory"
-		location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			_value="Test service"/>
-</oaf_server>
-
-<!-- This does not work
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"
-                type="exe"
-                location="test-bonobo-service">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME:GenericFactory:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        _value="Factory for the test bonobo component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-                type="factory"
-                location="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:Evolution:SummaryComponent:1.0"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="description" type="string"
-                        _value="Test bonobo service"/>
-</oaf_server>
-
--->
-</oaf_info>
diff --git a/importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in b/importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in
deleted file mode 100644
index 6676042bf6..0000000000
--- a/importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Elm_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="evolution-elm-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Elm_Intelligent_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Elm_Intelligent_Importer_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-</oaf_info>
diff --git a/importers/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf.in b/importers/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf.in
deleted file mode 100644
index e80bbcacbf..0000000000
--- a/importers/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_GnomeCard_Intelligent_ImporterFactory"
-	    type="exe"
-	    location="evolution-gnomecard-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_GnomeCard_Intelligent_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_GnomeCard_Intelligent_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-</oaf_info>
diff --git a/importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in b/importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in
deleted file mode 100644
index a53d9bad6c..0000000000
--- a/importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Netscape_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="evolution-netscape-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Netscape_Intelligent_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Netscape_Intelligent_Importer_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-</oaf_info>
diff --git a/importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in b/importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in
deleted file mode 100644
index 00d15710f4..0000000000
--- a/importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Pine_Intelligent_Importer_Factory"
-	    type="exe"
-	    location="evolution-pine-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Pine_Intelligent_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Pine_Intelligent_Importer_Factory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/>
-	</oaf_attribute>
-
-</oaf_server>
-</oaf_info>
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
deleted file mode 100644
index 4d6f4ea33a..0000000000
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ /dev/null
@@ -1,309 +0,0 @@
-<oaf_info>
-
-  <!-- Folder display control -->
-
-  <!-- (control) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Control"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:BonoboControl/evolution-mail:1.0"/>
-      <item value="IDL:GNOME/Control:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail folder display component."/>
-  </oaf_server>
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ControlFactory"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/ObjectFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail folder factory component."/>
-  </oaf_server>
-
-  <!-- Shell Component -->
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ShellComponent"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution component for handling mail."/>
-
-    <oaf_attribute name="evolution:shell_component_icon" type="string"
-		   value="evolution-inbox.png"/>
-    <oaf_attribute name="evolution:shell_component_launch_order" type="number"
-		   value="1"/>
-  </oaf_server>
-
-  <!-- Summary component, for showing info in the summary -->
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Factory for the Mail Summary component."/>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponent"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail executive summary component."/>
-  </oaf_server>
-
-  <!-- Message composer -->
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerFactory"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Factory for the Evolution composer."/>
-  </oaf_server>
-
-  <!-- (composer) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Composer"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ComposerFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution:Composer:1.0"/>
-      <item value="IDL:Bonobo/ItemContainer:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Evolution mail composer."/>
-  </oaf_server>
-
-  <!-- Config Wizard interface -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
-              type="exe"
-              location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig"
-              type="factory"
-              location="OAFIID:GNOME_Evolution_MailConfig_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-                   _value="Mail configuration interface"/>
-  </oaf_server>
-
-  <!-- MailConfig interface -->
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <!-- (interface) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_MailConfig_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Mail configuration interface"/>
-  </oaf_server>
-
-  <!-- FolderInfo interface -->
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_FolderInfo_Factory"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <!-- (interface) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_FolderInfo"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_FolderInfo_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/FolderInfo:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <!-- Startup Wizard -->
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard_Factory"
-	      type="exe"
-	      location="evolution-mail">
-  </oaf_server>
-
-  <!-- (wizard) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_Wizard_Factory">
-  </oaf_server>
-
-
-  <!-- Configuration pages -->
-
-  <!-- (factory) -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory"
-	      type="exe"
-	      location="evolution-mail">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <!-- Account Editor -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Accounts_ConfigControl"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:title" type="string"
-		   _value="Mail Accounts"/>
-
-    <oaf_attribute name="evolution:config_item:description" type="string"
-		   _value="Configure your email accounts here"/>
-
-    <oaf_attribute name="evolution:config_item:icon_name" type="string"
-		   value="mail-accounts-settings.png"/>
-
-    <oaf_attribute name="evolution:config_item:type" type="stringv">
-	<item value="mail"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:priority" type="string" value="-10"/>
-    
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Mail Accounts."/>
-
-  </oaf_server>
-
-  <!-- Mail Preferences -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:title" type="string"
-		   _value="Mail Preferences"/>
-
-    <oaf_attribute name="evolution:config_item:description" type="string"
-		   _value="Configure mail preferences, including security and message display, here"/>
-
-    <oaf_attribute name="evolution:config_item:icon_name" type="string"
-		   value="mail-config-druid.png"/>
-    
-    <oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/>
-    
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Mailer."/>
-
-  </oaf_server>
-
-  <!-- Font Preferences -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:title" type="string"
-		   _value="Font Preferences"/>
-
-    <oaf_attribute name="evolution:config_item:description" type="string"
-		   _value="Configure the fonts used by Evolution here"/>
-
-    <oaf_attribute name="evolution:config_item:icon_name" type="string"
-		   value="font.png"/>
-    
-    <oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/>
-    
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Display Fonts."/>
-
-  </oaf_server>
-
-  <!-- Composer Preferences -->
-  <oaf_server iid="OAFIID:GNOME_Evolution_Mail_ComposerPrefs_ConfigControl"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ConfigControlFactory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:title" type="string"
-		   _value="Composer Preferences"/>
-
-    <oaf_attribute name="evolution:config_item:description" type="string"
-		   _value="Configure spell-checking, signatures, and the message composer here"/>
-
-    <oaf_attribute name="evolution:config_item:icon_name" type="string"
-		   value="composer-settings.png"/>
-    
-    <oaf_attribute name="evolution:config_item:priority" type="string" value="-8"/>
-    
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for the Evolution Message Composer."/>
-
-  </oaf_server>
-
-</oaf_info>
-
-
-
diff --git a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in b/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in
deleted file mode 100644
index b9da9ce3c8..0000000000
--- a/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import mbox into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Mbox_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Mbox_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="MBox (mbox)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports mbox files into Evolution"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in b/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in
deleted file mode 100644
index 66317e3d7a..0000000000
--- a/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import Outlook Express 4 mails into Evolution"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Mail_Outlook_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="Outlook Express 4 (.mbx)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports Outlook Express 4 files into Evolution"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/notes/GNOME_Evolution_Notes.oaf.in b/notes/GNOME_Evolution_Notes.oaf.in
deleted file mode 100644
index d65cb45412..0000000000
--- a/notes/GNOME_Evolution_Notes.oaf.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_controlFactory"
-            type="exe"
-            location="evolution-notes">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Notes control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_control"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_controlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponentFactory"
-	type="exe"
-	location="evolution-notes">
-	
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Factory for the Evolution notes component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Notes_shellComponent"
-	type="factory"
-	location="OAFIID:GNOME_Evolution_Notes_shellComponentFactory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling mail."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/shell/GNOME_Evolution_Shell.oaf.in b/shell/GNOME_Evolution_Shell.oaf.in
deleted file mode 100644
index 54d80530d9..0000000000
--- a/shell/GNOME_Evolution_Shell.oaf.in
+++ /dev/null
@@ -1,51 +0,0 @@
-<oaf_info>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell"
-	      type="exe"
-	      location="evolution">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/Shell:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="The Evolution shell."/>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory"
-	      type="exe"
-	      location="evolution-exchange-storage">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/GenericFactory:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_FolderSettings_Control"
-	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Shell_Config_Factory">
-
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/ConfigControl:1.0"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="evolution:config_item:title" type="string"
-		   _value="Folder Settings"/>
-
-    <oaf_attribute name="evolution:config_item:description" type="string"
-		   _value="Configure special folders and offline folder behavior here"/>
-
-    <oaf_attribute name="evolution:config_item:icon_name" type="string"
-		   value="folder-settings.png"/>
-
-    <oaf_attribute name="evolution:config_item:priority" type="string" value="-9"/>
-
-    <oaf_attribute name="evolution:config_item:type" type="stringv">
-      <item value="shell"/>
-    </oaf_attribute>
-
-    <oaf_attribute name="description" type="string"
-		   _value="Configuration control for Evolution folder settings."/>
-  </oaf_server>
-
-</oaf_info>