diff --git a/src/plugins/Records.py b/src/plugins/Records.py
index 034292a96..1eb60a87e 100644
--- a/src/plugins/Records.py
+++ b/src/plugins/Records.py
@@ -361,23 +361,7 @@ class RecordsGramplet(Gramplet):
                     last_value = value
                     rank = number
                 self.append_text("\n  %s. " % (rank+1))
-                # TODO: When linktype 'Family' is introduced, use this:
-                # self.link(name, handletype, handle)
-                # TODO: instead of this:
-                if handletype == 'Family':
-                    family = self.dbstate.db.get_family_from_handle(handle)
-                    father_handle = family.get_father_handle()
-                    father = self.dbstate.db.get_person_from_handle(father_handle)
-                    father_name = _person_get_display_name(father, RecordsReportOptions.CALLNAME_DONTUSE)
-                    self.link(father_name, 'Person', father_handle)
-                    self.append_text(_(" and "))
-                    mother_handle = family.get_mother_handle()
-                    mother = self.dbstate.db.get_person_from_handle(mother_handle)
-                    mother_name = _person_get_display_name(mother, RecordsReportOptions.CALLNAME_DONTUSE)
-                    self.link(mother_name, 'Person', mother_handle)
-                else:
-                    self.link(name, handletype, handle)
-                # TODO: end.
+                self.link(name, handletype, handle)
                 self.append_text(" (%s)" % _output(value))
             self.append_text("\n")
         self.append_text("", scroll_to='begin')
diff --git a/src/plugins/WhatsNext.py b/src/plugins/WhatsNext.py
index 7be997b8d..2e246bf26 100644
--- a/src/plugins/WhatsNext.py
+++ b/src/plugins/WhatsNext.py
@@ -312,19 +312,7 @@ class WhatNextGramplet(Gramplet):
             missingbits.append(_("relation type unknown"))
 
         if missingbits:
-            # TODO: When linktype 'Family' is introduced, use this:
-            # self.link(name, 'Family', family.get_handle())
-            # TODO: instead of this:
-            if person1:
-                self.link(name1, 'Person', person1.get_handle())
-            else:
-                self.append_text(name1)
-            self.append_text(_(" and "))
-            if person2:
-                self.link(name2, 'Person', person2.get_handle())
-            else:
-                self.append_text(name2)
-            # TODO: end.
+            self.link(name, 'Family', family.get_handle())
             self.append_text(_(": %(list)s\n") % {
                 'list': _(", ").join(missingbits)})
             self.__counter += 1