diff --git a/vfs-methods/fontilus/.cvsignore b/vfs-methods/fontilus/.cvsignore
index 69d01a533..0edf11c61 100644
--- a/vfs-methods/fontilus/.cvsignore
+++ b/vfs-methods/fontilus/.cvsignore
@@ -8,9 +8,7 @@ Makefile.in
 .deps
 gnome-thumbnail-font
 gnome-font-viewer
-fontilus-context-menu
 font-method.directory
 fontilus.schemas
-fontilus.server
-fontilus.server.in
 gnome-font-viewer.desktop
+gnome-font-viewer.desktop.in
diff --git a/vfs-methods/fontilus/fontilus.server.in.in b/vfs-methods/fontilus/fontilus.server.in.in
deleted file mode 100644
index cb3dfa006..000000000
--- a/vfs-methods/fontilus/fontilus.server.in.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?> <!--*- mode: xml -*-->
-
-<oaf_info>
-  <oaf_server iid="OAFIID:Fontilus_Context_Menu_Factory"
-              type="exe" location="@LIBEXECDIR@/fontilus-context-menu">
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/ObjectFactory:1.0" />
-    </oaf_attribute>
-    <oaf_attribute name="name" type="string" _value="Fontilus context menu factory" />
-    <oaf_attribute name="description" type="string" _value="Factory for the fontilus context menu" />
-  </oaf_server>
-
-  <oaf_server iid="OAFIID:Fontilus_Context_Menu"
-              type="factory" location="OAFIID:Fontilus_Context_Menu_Factory">
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/Unknown:1.0" />
-      <item value="IDL:Bonobo/Listener:1.0" />
-    </oaf_attribute>
-    <oaf_attribute name="name" type="string" _value="Fontilus context menu" />
-    <oaf_attribute name="description" type="string" _value="Nautilus context menu entries for fonts" />
-    <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
-      <item value="fonts" />
-    </oaf_attribute>
-    <oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-      <item value="application/x-font-ttf" />
-      <item value="application/x-font-type1" />
-      <item value="application/x-font-pcf" />
-      <item value="application/x-font-otf" />
-    </oaf_attribute>
-    <oaf_attribute name="nautilus:context_menu_handler" type="boolean" value="true" />
-    <oaf_attribute name="nautilus:can_handle_multiple_files" type="boolean" value="false" />
-    <oaf_attribute name="nautilusverb:SetAsApplicationFont" type="string" _value="Set as Application Font" />
-  </oaf_server>
-</oaf_info>