diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py
index f70b56a43..6de5a19b0 100644
--- a/src/gui/editors/editname.py
+++ b/src/gui/editors/editname.py
@@ -35,6 +35,7 @@ from gen.ggettext import gettext as _
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
+import gobject
 import gtk
 
 #-------------------------------------------------------------------------
@@ -436,7 +437,6 @@ class EditName(EditSecondary):
         data must be saved, and also bug 1892 occurs on reopening of the editor.
         """
         # can't use group_over, see Note in gen/lib/name/Name.set_group_as().
-        print 'cleaning up'
         if not self.group_as.obj.get_editable():
             self.obj.set_group_as("")
         EditSecondary._cleanup_on_exit(self)
diff --git a/src/gui/editors/editsecondary.py b/src/gui/editors/editsecondary.py
index 80c8784c6..044f2d499 100644
--- a/src/gui/editors/editsecondary.py
+++ b/src/gui/editors/editsecondary.py
@@ -117,8 +117,7 @@ class EditSecondary(ManagedWindow.ManagedWindow, DbGUIElement):
         self.uistate = None
         self.obj = None
         self.db = None
-        if self.callman:
-            self.callman.database = None
+        self.callman.database = None
         self.callman = None
 
     def define_ok_button(self,button,function):