diff --git a/ChangeLog b/ChangeLog
index d638bab57..42649db7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-15  Don Allingham  <don@gramps-project.org>
+	* src/Config/_GrampsConfigKeys.py: remove unused USE_LDS key
+	* data/gramps.schemas.in: remove unused USE_LDS key
+	* src/StartupDialog.py: remove uused USE_LDS key
+
 2006-07-14  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_GrampsBSDDB.py: disable TXN for readonly dbs
 	* src/DbLoader.py (DbLoader.read_file): handle DBAccessError
diff --git a/data/gramps.schemas.in b/data/gramps.schemas.in
index 8db8f3f54..739004362 100644
--- a/data/gramps.schemas.in
+++ b/data/gramps.schemas.in
@@ -598,18 +598,6 @@
         </locale>
       </schema>
 
-      <schema>
-        <key>/schemas/apps/gramps/behavior/use-lds</key>
-        <applyto>/apps/gramps/behavior/use-lds</applyto>
-        <owner>gramps</owner>
-        <type>bool</type>
-        <default>0</default>
-        <locale name="C">
-          <short>Use LDS options</short>
-          <long>If set to 1, the LDS ordinance options will be shown.</long>
-        </locale>
-      </schema>
-
       <schema>
         <key>/schemas/apps/gramps/behavior/use-tips</key>
         <applyto>/apps/gramps/behavior/use-tips</applyto>
diff --git a/src/Config/_GrampsConfigKeys.py b/src/Config/_GrampsConfigKeys.py
index 86a8c15a8..084c1eb5f 100644
--- a/src/Config/_GrampsConfigKeys.py
+++ b/src/Config/_GrampsConfigKeys.py
@@ -67,7 +67,6 @@ SIZE_CHECKED         = ('interface','size-checked', 0)
 STATUSBAR            = ('interface','statusbar', 1)
 SURNAME_GUESSING     = ('behavior','surname-guessing', 1)
 TOOLBAR_ON           = ('interface','toolbar-on', 0)
-USE_LDS              = ('behavior','use-lds', 0)
 USE_TIPS             = ('behavior','use-tips', 0)
 POP_PLUGIN_STATUS    = ('behavior','pop-plugin-status', 0)
 VIEW                 = ('interface','view', 0)
@@ -123,7 +122,6 @@ default_value = {
     STATUSBAR            : 1,
     SURNAME_GUESSING     : 0,
     TOOLBAR_ON           : True,
-    USE_LDS              : False,
     USE_TIPS             : False,
     POP_PLUGIN_STATUS    : False,
     VIEW                 : True,
diff --git a/src/StartupDialog.py b/src/StartupDialog.py
index c8ca31402..6793b5a85 100644
--- a/src/StartupDialog.py
+++ b/src/StartupDialog.py
@@ -95,8 +95,6 @@ def upgrade_prefs():
 
         Config.set(Config.AUTOLOAD,
                    client.get_bool('/apps/gramps/autoload'))
-        Config.set(Config.USE_LDS,
-                   client.get_bool('/apps/gramps/use-lds'))
         Config.set(Config.STATUSBAR,
                    client.get_int('/apps/gramps/statusbar'))
         Config.set(Config.VIEW,
@@ -141,7 +139,6 @@ class StartupDialog:
               'Preferences dialog under the Settings menu.'))
         try:
             self.w.add_page(_('Researcher information'),self.build_page2())
-            self.w.add_page(_('LDS support'), self.build_page5())
         except IndexError:
             ErrorDialog(_("Configuration error"),
                         _("\n\nPossibly the installation of GRAMPS was incomplete."
@@ -180,8 +177,6 @@ class StartupDialog:
         Config.set(Config.RESEARCHER_EMAIL,
                    unicode(self.email.get_text()))
 
-        Config.set(Config.USE_LDS,
-                   self.lds.get_active())
         Config.set(Config.STARTUP,
                    const.startup)
         self.w.destroy()        
@@ -194,9 +189,11 @@ class StartupDialog:
         box.set_spacing(12)
         
         label = gtk.Label(
-            _('In order to create valid GEDCOM files, the following '
-              'information needs to be entered. If you do not plan to '
-              'generate GEDCOM files, you may leave this empty.'))
+            _('The following information is needed if you want to export '
+              'your data to a GEDCOM file. A GEDCOM file can be imported '
+              'into nearly all genealogy programs. A valid GEDCOM file '
+              'needs this information, but most programs do not require '
+              'it. You may leave this empty if you want.'))
         label.set_line_wrap(True)
         
         box.pack_start(label)
@@ -226,7 +223,7 @@ class StartupDialog:
             except:
                 name = ""
 
-        self.name.set_text(name)
+        self.name.set_text(name.replace(',,,',''))
 
         try:
             self.addr.set_text(Config.get(Config.RESEARCHER_ADDR))
@@ -249,32 +246,6 @@ class StartupDialog:
             gtk.main_quit()
         return box
 
-    def build_page5(self):
-        box = gtk.VBox()
-        box.set_spacing(12)
-        
-        label = gtk.Label(
-            _('GRAMPS has support for LDS Ordinances, which are special '
-              'event types\nrelated to the Church of Jesus Christ of '
-              'Latter Day Saints.\n\nYou may choose to either enable '
-              'or disable this support. You may\nchange this option in '
-              'the future in the Preferences dialog.'))
-
-        box.add(label)
-        align = gtk.Alignment(0.5,0)
-        box.add(align)
-        vbox = gtk.VBox()
-        vbox.set_spacing(6)
-        
-        self.lds = gtk.CheckButton(label=_("Enable LDS ordinance support"))
-
-        self.lds.set_active(Config.get(Config.USE_LDS))
-
-        align.add(self.lds)
-        
-        box.show_all()
-        return box
-
 def make_label(table,val,y,x1,x2,x3,x4):
     label = gtk.Label(val)
     label.set_alignment(0,0.5)