diff --git a/ChangeLog b/ChangeLog
index 8a0832f68..5e9398430 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2007-07-17  Alex Roitman  <shura@gramps-project.org>
+	* src/RelLib/_SourceRef.py (unserialize): Minor change.
+	* src/RelLib/_Source.py: Remove note.
+	* src/RelLib/_Person.py (get_text_data_child_list): Remove note.
 	* data/grampsxml.dtd: Add missing datespan for lds and sourceref.
 	* data/grampsxml.rng: Add privacy to reporef.
 	* data/grampsxml.dtd: Add privacy to reporef.
diff --git a/src/RelLib/_Person.py b/src/RelLib/_Person.py
index 4f65dfe30..bbb8c15cc 100644
--- a/src/RelLib/_Person.py
+++ b/src/RelLib/_Person.py
@@ -295,7 +295,7 @@ class Person(SourceBase, NoteBase, AttributeBase, MediaBase,
         @return: Returns the list of child objects that may carry textual data.
         @rtype: list
         """
-        check_list = self.lds_ord_list + [self.note]
+        check_list = self.lds_ord_list
         add_list = [item for item in check_list if item]
         return [self.primary_name] + self.media_list + \
                     self.alternate_names + self.address_list + \
diff --git a/src/RelLib/_Source.py b/src/RelLib/_Source.py
index 0189252b4..01d1c61ff 100644
--- a/src/RelLib/_Source.py
+++ b/src/RelLib/_Source.py
@@ -34,7 +34,6 @@ __revision__ = "$Revision$"
 from _PrimaryObject import PrimaryObject
 from _MediaBase import MediaBase
 from _NoteBase import NoteBase
-from _Note import Note
 from _RepoRef import RepoRef
 
 #-------------------------------------------------------------------------
@@ -53,7 +52,6 @@ class Source(MediaBase, NoteBase, PrimaryObject):
         self.title = ""
         self.author = ""
         self.pubinfo = ""
-        self.note = Note()
         self.datamap = {}
         self.abbrev = ""
         self.reporef_list = []
diff --git a/src/RelLib/_SourceRef.py b/src/RelLib/_SourceRef.py
index b717e2cbb..8d1c61d2a 100644
--- a/src/RelLib/_SourceRef.py
+++ b/src/RelLib/_SourceRef.py
@@ -83,11 +83,11 @@ class SourceRef(SecondaryObject, DateBase, PrivacyBase, NoteBase, RefBase):
         """
         Converts a serialized tuple of data to an object
         """
-        (date, privacy, note,
+        (date, privacy, note_list,
          self.confidence, ref, self.page) = data
         DateBase.unserialize(self, date)
         PrivacyBase.unserialize(self, privacy)
-        NoteBase.unserialize(self, note)
+        NoteBase.unserialize(self, note_list)
         RefBase.unserialize(self, ref)
         return self