diff --git a/gramps2/example/gramps/data.gramps b/gramps2/example/gramps/data.gramps
index 3e43c08f8..f0d1b873a 100644
Binary files a/gramps2/example/gramps/data.gramps and b/gramps2/example/gramps/data.gramps differ
diff --git a/gramps2/src/AddMedia.py b/gramps2/src/AddMedia.py
index 7e6b9133d..dd5a9c2e3 100644
--- a/gramps2/src/AddMedia.py
+++ b/gramps2/src/AddMedia.py
@@ -43,12 +43,6 @@ from intl import gettext as _
 #
 #-------------------------------------------------------------------------
 from QuestionDialog import ErrorDialog
-
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py
index 5aaf41b6f..a8823ec7a 100644
--- a/gramps2/src/AddSpouse.py
+++ b/gramps2/src/AddSpouse.py
@@ -37,11 +37,6 @@ from intl import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk.glade
 
@@ -116,7 +111,7 @@ class AddSpouse:
         when a row has been selected.
         """
 
-        model,iter = self.selection.get_selected()
+        model,iter = self.slist.get_selected()
         if iter:
             self.ok.set_sensitive(1)
         else:
@@ -157,7 +152,7 @@ class AddSpouse:
         selected from the list.
         """
 
-        model,iter = self.selection.get_selected()
+        model,iter = self.slist.get_selected()
         if not iter:
             return
         
@@ -224,137 +219,4 @@ class AddSpouse:
                 continue
             self.slist.add([data[0],data[1],data[3],data[5],data[6]],key,person==key)
 
-#-------------------------------------------------------------------------
-#
-# SetSpouse
-#
-#-------------------------------------------------------------------------
-class SetSpouse:
-    """
-    Displays the AddSpouse dialog, allowing the user to create a new
-    family with the passed person as one spouse, and another person to
-    be selected.
-    """
-    def __init__(self,db,person,family,update,addperson):
-        """
-        Displays the AddSpouse dialog box.
 
-        db - database to which to add the new family
-        person - the current person, will be one of the parents
-        update - function that updates the family display
-        addperson - function that adds a person to the person view
-        """
-        self.db = db
-        self.update = update
-        self.person = person
-        self.family = family
-        self.addperson = addperson
-
-        self.glade = gtk.glade.XML(const.gladeFile, "spouseDialog")
-
-        self.rel_combo = self.glade.get_widget("rel_combo")
-        self.relation_type = self.glade.get_widget("rel_type")
-        self.spouse_list = self.glade.get_widget("spouseList")
-        self.relation_def = self.glade.get_widget("reldef")
-
-        self.rel_combo.set_popdown_strings(const.familyRelations)
-        title = _("Choose Spouse/Partner of %s") % GrampsCfg.nameof(person)
-        self.glade.get_widget("spouseTitle").set_text(title)
-
-        self.glade.signal_autoconnect({
-            "on_select_spouse_clicked" : self.select_spouse_clicked,
-            "on_new_spouse_clicked"    : self.new_spouse_clicked,
-            "on_rel_type_changed"      : self.relation_type_changed,
-            "on_combo_insert_text"     : Utils.combo_insert_text,
-            "destroy_passed_object"    : Utils.destroy_passed_object
-            })
-
-        self.relation_type.set_text(_("Married"))
-
-    def new_spouse_clicked(self,obj):
-        """
-        Called when the spouse to be added does not exist, and needs
-        to be created and added to the database
-        """
-        import QuickAdd
-
-        relation = const.save_frel(self.relation_type.get_text())
-        if relation == "Partners":
-            if self.person.getGender() == RelLib.Person.male:
-                gen = "male"
-            else:
-                gen = "female"
-        elif self.person.getGender() == RelLib.Person.male:
-            gen = "female"
-        else:
-            gen = "male"
-        QuickAdd.QuickAdd(self.db,gen,self.update_list)
-
-    def update_list(self,person):
-        self.addperson(person)
-        self.relation_type_changed(self.relation_type)
-
-    def select_spouse_clicked(self,obj):
-        """
-        Called when the spouse to be added already exists and has been
-        selected from the list.
-        """
-        if len(self.spouse_list.selection) == 0:
-            return
-        row = self.spouse_list.selection[0]
-        spouse = self.db.getPerson(self.spouse_list.get_row_data(row))
-
-        # don't do anything if the marriage already exists
-        for f in self.person.getFamilyList():
-            if spouse == f.getMother() or spouse == f.getFather():
-                Utils.destroy_passed_object(obj)
-                return
-
-        Utils.modified()
-        if self.family.getFather() == self.person:
-            self.family.setMother(spouse)
-        else:
-            self.family.setFather(spouse)
-            
-        spouse.addFamily(self.family)
-
-        reltype = self.relation_type.get_text()
-        self.family.setRelationship(const.save_frel(reltype))
-        Utils.destroy_passed_object(obj)
-        self.update(self.family)
-
-    def relation_type_changed(self,obj):
-        """
-        Called whenever the relationship type changes. Rebuilds the
-        the potential spouse list.
-        """
-        text = obj.get_text()
-        self.relation_def.set_text(const.relationship_def(text))
-    
-        # determine the gender of the people to be loaded into
-        # the potential spouse list. If Partners is selected, use
-        # the same gender as the current person.
-        gender = self.person.getGender()
-        if text == _("Partners"):
-            if gender == RelLib.Person.male:
-                sgender = const.female
-            else:
-                sgender = const.male
-	else:
-            if gender == RelLib.Person.male:
-                sgender = const.male
-            else:
-                sgender = const.female
-            
-        index = 0
-        self.spouse_list.clear()
-        self.spouse_list.freeze()
-        for key in self.db.getPersonKeys():
-            data = self.db.getPersonDisplay(key)
-            if data[2] == sgender:
-                continue
-
-            self.spouse_list.append([data[0],data[3],data[5],data[6]])
-            self.spouse_list.set_row_data(index,key)
-            index = index + 1
-        self.spouse_list.thaw()
diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py
index c2f7b86fb..2a50ca338 100644
--- a/gramps2/src/AddrEdit.py
+++ b/gramps2/src/AddrEdit.py
@@ -27,11 +27,6 @@ mechanism for the user to edit address information.
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py
index 87f3ee602..ce4dfb4a8 100644
--- a/gramps2/src/AttrEdit.py
+++ b/gramps2/src/AttrEdit.py
@@ -30,11 +30,6 @@ __version__ = "$Revision$"
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/AutoComp.py b/gramps2/src/AutoComp.py
index 9188d369f..38e9e6e57 100644
--- a/gramps2/src/AutoComp.py
+++ b/gramps2/src/AutoComp.py
@@ -39,11 +39,6 @@ import string
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/Bookmarks.py b/gramps2/src/Bookmarks.py
index d31e5054a..64da9c652 100644
--- a/gramps2/src/Bookmarks.py
+++ b/gramps2/src/Bookmarks.py
@@ -28,11 +28,6 @@ __version__ = "$Revision$"
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk 
 import gnome.ui
 
diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py
index c1bad335a..756dcb560 100644
--- a/gramps2/src/ChooseParents.py
+++ b/gramps2/src/ChooseParents.py
@@ -38,11 +38,6 @@ from intl import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk.glade
 
diff --git a/gramps2/src/DateEdit.py b/gramps2/src/DateEdit.py
index 4618e6a2a..b87920a97 100644
--- a/gramps2/src/DateEdit.py
+++ b/gramps2/src/DateEdit.py
@@ -34,11 +34,6 @@ __version__ = "$Revision$"
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.gdk
 
diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py
index 08f8283b1..23582d6bd 100644
--- a/gramps2/src/DbPrompter.py
+++ b/gramps2/src/DbPrompter.py
@@ -24,11 +24,6 @@
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.glade
 
diff --git a/gramps2/src/DisplayTrace.py b/gramps2/src/DisplayTrace.py
index 75d09b114..b9dd97e4d 100644
--- a/gramps2/src/DisplayTrace.py
+++ b/gramps2/src/DisplayTrace.py
@@ -32,11 +32,6 @@ import sys
 # GTK/GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 316b7f3a6..abcc74542 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -31,11 +31,6 @@ import pickle
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gnome.ui 
diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py
index 3fe816aaa..10f56124e 100644
--- a/gramps2/src/EditPlace.py
+++ b/gramps2/src/EditPlace.py
@@ -30,11 +30,6 @@ import pickle
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gtk.glade
diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py
index 8ea4696c6..404a4d77a 100644
--- a/gramps2/src/EditSource.py
+++ b/gramps2/src/EditSource.py
@@ -24,11 +24,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py
index bd82f1256..405cb4c83 100644
--- a/gramps2/src/EventEdit.py
+++ b/gramps2/src/EventEdit.py
@@ -25,11 +25,6 @@ from string import strip
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.glade
 
diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py
index fbb09412b..4acad7665 100644
--- a/gramps2/src/FamilyView.py
+++ b/gramps2/src/FamilyView.py
@@ -23,11 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gtk.glade
diff --git a/gramps2/src/Filter.py b/gramps2/src/Filter.py
index 5258d557a..16823e4a4 100644
--- a/gramps2/src/Filter.py
+++ b/gramps2/src/Filter.py
@@ -27,11 +27,6 @@ import re
 import os
 import sys
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 
 from intl import gettext as _
diff --git a/gramps2/src/Find.py b/gramps2/src/Find.py
index 7acefabbc..d57e814bd 100644
--- a/gramps2/src/Find.py
+++ b/gramps2/src/Find.py
@@ -35,11 +35,6 @@ import string
 # Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 from gnome.ui import *
 
diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py
index ff95fd654..51b6f42cc 100644
--- a/gramps2/src/GenericFilter.py
+++ b/gramps2/src/GenericFilter.py
@@ -40,11 +40,6 @@ except:
 import os
 from string import find,join,strip,replace
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py
index 5a24f7a2d..8fdc7b51b 100644
--- a/gramps2/src/GrampsCfg.py
+++ b/gramps2/src/GrampsCfg.py
@@ -35,11 +35,6 @@ import Plugins
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gconf
 import gtk
diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py
index e3b6b4ae9..59118a953 100644
--- a/gramps2/src/ImageSelect.py
+++ b/gramps2/src/ImageSelect.py
@@ -32,11 +32,6 @@ import urlparse
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gnome.ui
@@ -223,6 +218,7 @@ class Gallery(ImageSelect):
             icon_list.connect("drag_data_get",
                               self.on_photolist_drag_data_get)
 
+        icon_list.connect('destroy',self.unmap)
         # Remember arguments
         self.path      = path;
         self.dataobj   = dataobj;
@@ -239,6 +235,11 @@ class Gallery(ImageSelect):
         self.sel = None
         self.photo = None
 
+    def unmap(self,obj):
+        for i in self.item_map.keys():
+            print i
+            i.destroy()
+        
     def on_canvas1_event(self,obj,event):
         """Handle resize events over the canvas, redrawing if the size changes"""
 
diff --git a/gramps2/src/ImgManip.py b/gramps2/src/ImgManip.py
index bc4937a32..d7df9b9a6 100644
--- a/gramps2/src/ImgManip.py
+++ b/gramps2/src/ImgManip.py
@@ -27,11 +27,6 @@ import string
 # Check for the python imaging library
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 try:
     import PIL.Image
     import StringIO
diff --git a/gramps2/src/ListModel.py b/gramps2/src/ListModel.py
index 0eaf7e1f1..00fca8bcc 100644
--- a/gramps2/src/ListModel.py
+++ b/gramps2/src/ListModel.py
@@ -18,11 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 from gobject import TYPE_STRING, TYPE_PYOBJECT
 import gtk
 
diff --git a/gramps2/src/LocEdit.py b/gramps2/src/LocEdit.py
index f80f93641..05780a204 100644
--- a/gramps2/src/LocEdit.py
+++ b/gramps2/src/LocEdit.py
@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py
index 96885b135..17b6ebe01 100644
--- a/gramps2/src/Marriage.py
+++ b/gramps2/src/Marriage.py
@@ -25,10 +25,6 @@ import pickle
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.glade
diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py
index c6252ef6e..ff7296a17 100644
--- a/gramps2/src/MediaView.py
+++ b/gramps2/src/MediaView.py
@@ -30,10 +30,6 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.gdk
diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py
index 0c0ef72da..62389d8b1 100644
--- a/gramps2/src/MergeData.py
+++ b/gramps2/src/MergeData.py
@@ -30,10 +30,6 @@ import string
 # GNOME
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/NameEdit.py b/gramps2/src/NameEdit.py
index e7acc3808..7cf73c804 100644
--- a/gramps2/src/NameEdit.py
+++ b/gramps2/src/NameEdit.py
@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/NoteEdit.py b/gramps2/src/NoteEdit.py
index c68066875..ed380352e 100644
--- a/gramps2/src/NoteEdit.py
+++ b/gramps2/src/NoteEdit.py
@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 import gnome.ui
 
diff --git a/gramps2/src/PaperMenu.py b/gramps2/src/PaperMenu.py
index b7d0d4b71..d4c8b2261 100644
--- a/gramps2/src/PaperMenu.py
+++ b/gramps2/src/PaperMenu.py
@@ -23,10 +23,6 @@
 # GNOME modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py
index 9a931cc4a..a5af737b0 100644
--- a/gramps2/src/PedView.py
+++ b/gramps2/src/PedView.py
@@ -27,11 +27,6 @@ _PERSON    = "p"
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gtk.gdk
 import gnome.canvas
@@ -154,7 +149,7 @@ class PedigreeView:
            as the root person of the tree."""
 
         for i in self.canvas_items:
-            self.i.destroy()
+            i.destroy()
         for i in self.boxes:
             i.cleanup()
             
diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py
index fe382ac6f..852b596ab 100644
--- a/gramps2/src/PlaceView.py
+++ b/gramps2/src/PlaceView.py
@@ -27,10 +27,6 @@ Handles the place view for GRAMPS.
 # GTK modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.gdk
diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py
index 61721c990..71d17bbc7 100644
--- a/gramps2/src/Plugins.py
+++ b/gramps2/src/Plugins.py
@@ -32,10 +32,6 @@ filters, importer, exporters, and document generators.
 # GTK libraries
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.glade
diff --git a/gramps2/src/QuestionDialog.py b/gramps2/src/QuestionDialog.py
index f0db00470..163da9e73 100644
--- a/gramps2/src/QuestionDialog.py
+++ b/gramps2/src/QuestionDialog.py
@@ -18,11 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gnome.ui
 from intl import gettext as _
diff --git a/gramps2/src/QuickAdd.py b/gramps2/src/QuickAdd.py
index cab195419..685b39360 100644
--- a/gramps2/src/QuickAdd.py
+++ b/gramps2/src/QuickAdd.py
@@ -18,10 +18,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 import Utils
diff --git a/gramps2/src/RelImage.py b/gramps2/src/RelImage.py
index de665eed8..48d8bfc51 100644
--- a/gramps2/src/RelImage.py
+++ b/gramps2/src/RelImage.py
@@ -31,10 +31,6 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 from QuestionDialog import ErrorDialog
 
diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py
index b711876d6..2331b61ae 100644
--- a/gramps2/src/Report.py
+++ b/gramps2/src/Report.py
@@ -36,10 +36,6 @@ import string
 # GNOME/GTK modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 import gnome.ui
 
diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py
index 9a45436c3..03ba2f6c5 100644
--- a/gramps2/src/SelectChild.py
+++ b/gramps2/src/SelectChild.py
@@ -37,10 +37,6 @@ import string
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py
index 5d49fe7e9..dfa6c695c 100644
--- a/gramps2/src/SourceView.py
+++ b/gramps2/src/SourceView.py
@@ -29,10 +29,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.gdk
diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py
index 844daa20d..dc5438e40 100644
--- a/gramps2/src/Sources.py
+++ b/gramps2/src/Sources.py
@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gobject
 import gtk
 import gtk.glade
diff --git a/gramps2/src/StartupDialog.py b/gramps2/src/StartupDialog.py
index bde13dda8..211d33d29 100644
--- a/gramps2/src/StartupDialog.py
+++ b/gramps2/src/StartupDialog.py
@@ -19,11 +19,6 @@
 #
 
 import const
-
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 import gnome
 import gconf
diff --git a/gramps2/src/StyleEditor.py b/gramps2/src/StyleEditor.py
index 954ca6709..7d23ba734 100644
--- a/gramps2/src/StyleEditor.py
+++ b/gramps2/src/StyleEditor.py
@@ -30,10 +30,6 @@ __version__ = "$Revision$"
 # GNOME/GTK modules
 #
 #------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 import gtk
 
diff --git a/gramps2/src/UrlEdit.py b/gramps2/src/UrlEdit.py
index f020c5b21..0680e361d 100644
--- a/gramps2/src/UrlEdit.py
+++ b/gramps2/src/UrlEdit.py
@@ -23,10 +23,6 @@
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py
index b7e530be6..3950dff17 100644
--- a/gramps2/src/Utils.py
+++ b/gramps2/src/Utils.py
@@ -31,10 +31,6 @@ import os
 # GNOME/GTK
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk
 import grampslib
 
diff --git a/gramps2/src/VersionControl.py b/gramps2/src/VersionControl.py
index 83ac4a6ad..5587b6c0e 100644
--- a/gramps2/src/VersionControl.py
+++ b/gramps2/src/VersionControl.py
@@ -37,10 +37,6 @@ from re import compile
 # GTK/GNOME
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
 import gtk.glade
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py
index f7468aaca..18e8c02ed 100755
--- a/gramps2/src/gramps.py
+++ b/gramps2/src/gramps.py
@@ -18,12 +18,6 @@ except ImportError:
 #-------------------------------------------------------------------------
 import os
 import locale
-
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk.glade
 import intl
 
@@ -50,11 +44,6 @@ import sys
 # GNOME/GTK libraries
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gtk
 import gnome.ui
 
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index 3b19e1721..4df47d2f4 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -39,11 +39,6 @@ from intl import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-try:
-    import pygtk; pygtk.require('2.0')
-except ImportError: # not set up for parallel install
-    pass 
-
 import gobject
 import gtk
 import gnome.ui