diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
index 5c2e4e821..1e7aa366e 100644
--- a/openlp/core/ui/firsttimeform.py
+++ b/openlp/core/ui/firsttimeform.py
@@ -141,7 +141,6 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
                         u'bible_%s' % bible, u'title'), u'utf8')
                     filename = unicode(self.config.get(
                         u'bible_%s' % bible, u'filename'))
-                    # FIXME
                     item = QtGui.QTreeWidgetItem(langItem, title)
                     item.setData(0, QtCore.Qt.UserRole, filename)
                     item.setCheckState(0, QtCore.Qt.Unchecked)
diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py
index f213bc27d..f75c34eb5 100644
--- a/openlp/plugins/songs/forms/songexportform.py
+++ b/openlp/plugins/songs/forms/songexportform.py
@@ -218,7 +218,6 @@ class SongExportForm(OpenLPWizard):
             # Add the songs to the list of selected songs.
             for item in items:
                 song = QtGui.QListWidgetItem(item.text())
-                # TODO: check toPyObject()
                 song.setData(QtCore.Qt.UserRole,
                     item.data(QtCore.Qt.UserRole).toPyObject())
                 song.setFlags(QtCore.Qt.ItemIsEnabled)