diff -urN aa/gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas
--- aa/gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas	2003-09-05 14:35:53.000000000 +0200
+++ gnome-panel-2.6.1/gnome-panel/panel-compatibility.schemas	2004-04-20 00:03:54.872682832 +0200
@@ -182,14 +182,6 @@
       </schema>
      
       <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///nautilus.desktop</default>
-	<locale name="C"/>
-      </schema>
-     
-      <schema>
         <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_id</key>
         <owner>panel</owner>
         <type>string</type>
@@ -220,14 +212,6 @@
         <default>launcher-object</default>
 	<locale name="C"/>
       </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///System/gnome-terminal.desktop</default>
-	<locale name="C"/>
-      </schema>
      
       <schema>
         <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
diff -urN aa/gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries
--- aa/gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries	2004-04-02 19:05:41.000000000 +0200
+++ gnome-panel-2.6.1/gnome-panel/panel-default-setup.entries	2004-04-20 00:05:32.229882288 +0200
@@ -29,12 +29,6 @@
           <value>
             <string>menu_bar</string>
           </value>
-          <value>
-            <string>nautilus_launcher</string>
-          </value>
-          <value>
-            <string>terminal_launcher</string>
-          </value>
         </list>
       </value>
     </entry>
@@ -223,114 +217,6 @@
     <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Nautilus Launcher -->
-
-    <entry>
-      <key>objects/nautilus_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/nautilus_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/nautilus_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>1</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/nautilus_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/nautilus_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/nautilus_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>applications:///nautilus.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/nautilus_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/nautilus_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/nautilus_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/nautilus_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/nautilus_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/nautilus_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/nautilus_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/nautilus_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Terminal Launcher -->
-
-    <entry>
-      <key>objects/terminal_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/terminal_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/terminal_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>2</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/terminal_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/terminal_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/terminal_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>applications:///System/gnome-terminal.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/terminal_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/terminal_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/terminal_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/terminal_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/terminal_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/terminal_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/terminal_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/terminal_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
   <!-- Window Menu Applet -->
 
     <entry>