diff --git a/openlp-get-strings.py b/openlp-get-strings.py
index 0d4e3200a..2af5e476b 100644
--- a/openlp-get-strings.py
+++ b/openlp-get-strings.py
@@ -24,7 +24,6 @@
 ###############################################################################
 
 import os
-import sys
 import re
 
 ts_file = u"""<?xml version="1.0" encoding="utf-8"?>
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 755f3581c..016bb5259 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -28,7 +28,7 @@ import os
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib.toolbar import *
-from openlp.core.lib import translate, contextMenuAction, contextMenuSeparator
+from openlp.core.lib import contextMenuAction, contextMenuSeparator
 from serviceitem import ServiceItem
 
 class MediaManagerItem(QtGui.QWidget):
@@ -36,7 +36,7 @@ class MediaManagerItem(QtGui.QWidget):
     MediaManagerItem is a helper widget for plugins.
 
     None of the following *need* to be used, feel free to override
-    them cmopletely in your plugin's implementation. Alternatively,
+    them completely in your plugin's implementation. Alternatively,
     call them from your plugin before or after you've done extra
     things that you need to.
 
diff --git a/openlp/core/ui/about.py b/openlp/core/ui/about.py
index 1ab2dc430..c1c9006c2 100644
--- a/openlp/core/ui/about.py
+++ b/openlp/core/ui/about.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class AboutForm(QtGui.QDialog):
     """
diff --git a/openlp/core/ui/alertform.py b/openlp/core/ui/alertform.py
index e6c2cacbc..9c069bd1c 100644
--- a/openlp/core/ui/alertform.py
+++ b/openlp/core/ui/alertform.py
@@ -24,7 +24,7 @@
 
 import logging
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class AlertForm(QtGui.QDialog):
     global log
diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py
index 206826a09..e7ce0a013 100644
--- a/openlp/core/ui/alertstab.py
+++ b/openlp/core/ui/alertstab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab
 
 class AlertsTab(SettingsTab):
     """
diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index d5b0d0661..1a59e4fc3 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -23,7 +23,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_AmendThemeDialog(object):
     def setupUi(self, AmendThemeDialog):
diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py
index c3ec0f850..3a30a0d18 100644
--- a/openlp/core/ui/amendthemeform.py
+++ b/openlp/core/ui/amendthemeform.py
@@ -28,7 +28,7 @@ import os.path
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import ThemeXML, file_to_xml, translate
+from openlp.core.lib import ThemeXML, file_to_xml
 from amendthemedialog import Ui_AmendThemeDialog
 
 log = logging.getLogger(u'AmendThemeForm')
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index 6cc5feed7..98479af3e 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, str_to_bool
+from openlp.core.lib import SettingsTab, str_to_bool
 
 class GeneralTab(SettingsTab):
     """
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index c768210a0..2f58ee3c1 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -30,9 +30,8 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
     ServiceManager, ThemeManager, MainDisplay, SlideController, \
     PluginForm, MediaDockManager
-from openlp.core.lib import translate, RenderManager, PluginConfig, \
-    OpenLPDockWidget, SettingsManager, PluginManager, Receiver, \
-    buildIcon, str_to_bool
+from openlp.core.lib import RenderManager, PluginConfig, buildIcon, \
+    OpenLPDockWidget, SettingsManager, PluginManager, Receiver, str_to_bool
 from openlp.core.utils import check_latest_version
 
 media_manager_style = """
diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py
index 5d9ca5ef2..f733b8e2f 100644
--- a/openlp/core/ui/plugindialog.py
+++ b/openlp/core/ui/plugindialog.py
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_PluginViewDialog(object):
     def setupUi(self, PluginViewDialog):
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 4355667af..3964b9c60 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -30,7 +30,7 @@ import zipfile
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
-    translate, ServiceType, contextMenuAction, contextMenuSeparator, Receiver
+    ServiceType, contextMenuAction, contextMenuSeparator, Receiver
 
 class ServiceManagerList(QtGui.QTreeWidget):
 
diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py
index a11c87fee..a936f9f2f 100644
--- a/openlp/core/ui/settingsdialog.py
+++ b/openlp/core/ui/settingsdialog.py
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_SettingsDialog(object):
     def setupUi(self, SettingsDialog):
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 913d60bfe..02e0dc80d 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -26,7 +26,7 @@ import logging
 import time
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType
+from openlp.core.lib import OpenLPToolbar, Receiver, ServiceType
 
 label_stylesheet = u"""
 QTableWidget::item:selected
diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py
index 2624f66c4..3990a8f5c 100644
--- a/openlp/core/ui/splashscreen.py
+++ b/openlp/core/ui/splashscreen.py
@@ -23,7 +23,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class SplashScreen(object):
     def __init__(self, version):
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index c4d829a73..7b34874b3 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui
 
 from openlp.core.ui import AmendThemeForm
 from openlp.core.theme import Theme
-from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, translate, \
+from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, \
     str_to_bool, file_to_xml, buildIcon, Receiver, contextMenuAction, \
     contextMenuSeparator
 from openlp.core.utils import ConfigHelper
diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py
index 644238351..f50e6d227 100644
--- a/openlp/core/ui/themestab.py
+++ b/openlp/core/ui/themestab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, Receiver
+from openlp.core.lib import SettingsTab, Receiver
 
 class ThemesTab(SettingsTab):
     """
diff --git a/openlp/plugins/audit/auditplugin.py b/openlp/plugins/audit/auditplugin.py
index f4392649b..e2c3230ec 100644
--- a/openlp/plugins/audit/auditplugin.py
+++ b/openlp/plugins/audit/auditplugin.py
@@ -27,7 +27,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, Receiver, translate, str_to_bool, buildIcon
+from openlp.core.lib import Plugin, Receiver, str_to_bool, buildIcon
 from openlp.plugins.audit.lib import AuditManager
 from openlp.plugins.audit.forms import AuditDetailForm, AuditDeleteForm
 from openlp.plugins.audit.lib.models import AuditItem
diff --git a/openlp/plugins/audit/forms/auditdeleteform.py b/openlp/plugins/audit/forms/auditdeleteform.py
index bd1dbd4a6..d2e647a44 100644
--- a/openlp/plugins/audit/forms/auditdeleteform.py
+++ b/openlp/plugins/audit/forms/auditdeleteform.py
@@ -27,8 +27,6 @@ from datetime import date
 from PyQt4 import QtGui
 
 from auditdeletedialog import Ui_AuditDeleteDialog
-from openlp.core.lib import translate
-#from openlp.plugins.audit.lib import AuditManager
 
 class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog):
     """
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 5ebebe027..eb1018bf2 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -26,7 +26,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, translate, buildIcon
+from openlp.core.lib import Plugin, buildIcon
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
 class BiblePlugin(Plugin):
diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index fa4cdcd42..9a871ec88 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -29,8 +29,7 @@ import os.path
 from PyQt4 import QtCore, QtGui
 
 from bibleimportdialog import Ui_BibleImportDialog
-from openlp.core.lib import Receiver, translate
-
+from openlp.core.lib import Receiver
 
 class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
     global log
diff --git a/openlp/plugins/bibles/lib/bibleOSISimpl.py b/openlp/plugins/bibles/lib/bibleOSISimpl.py
index 09ada1fa4..cdcea869b 100644
--- a/openlp/plugins/bibles/lib/bibleOSISimpl.py
+++ b/openlp/plugins/bibles/lib/bibleOSISimpl.py
@@ -30,7 +30,7 @@ import codecs
 
 from PyQt4 import QtCore
 
-from openlp.core.lib import translate, Receiver
+from openlp.core.lib import Receiver
 
 class BibleOSISImpl():
     """
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index 31d3135cb..bf08acbec 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -26,7 +26,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, str_to_bool, Receiver
+from openlp.core.lib import str_to_bool, Receiver
 from openlp.core.lib import SettingsTab
 
 class BiblesTab(SettingsTab):
diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index 7a8b7eb38..a259af0c2 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -25,8 +25,6 @@
 import logging
 import os
 
-from openlp.core.lib import translate
-
 from bibleOSISimpl import BibleOSISImpl
 from bibleCSVimpl import BibleCSVImpl
 from bibleDBimpl import BibleDBImpl
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 3d024a90b..f78c20ca5 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -27,8 +27,8 @@ import time
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, MediaManagerItem, Receiver, \
-    BaseListWithDnD, str_to_bool
+from openlp.core.lib import MediaManagerItem, Receiver, str_to_bool, \
+    BaseListWithDnD
 from openlp.plugins.bibles.forms import BibleImportForm
 from openlp.plugins.bibles.lib.manager import BibleMode
 
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index 6d4464525..528f2d154 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -22,7 +22,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_customEditDialog(object):
     def setupUi(self, customEditDialog):
diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index 90868d928..01afe1b48 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -25,7 +25,7 @@
 from PyQt4 import QtCore, QtGui
 
 from editcustomdialog import Ui_customEditDialog
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver
 from openlp.plugins.custom.lib.models import CustomSlide
 
 class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py
index 937242b72..f5472b02c 100644
--- a/openlp/plugins/images/lib/imagetab.py
+++ b/openlp/plugins/images/lib/imagetab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, Receiver
+from openlp.core.lib import SettingsTab, Receiver
 
 class ImageTab(SettingsTab):
     """
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 5720a5209..fb947cc0d 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -26,7 +26,7 @@ import logging
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon, translate
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
 
 # We have to explicitly create separate classes for each plugin
 # in order for DnD to the Service manager to work correctly.
diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py
index 0c13c4593..69440faa8 100644
--- a/openlp/plugins/media/lib/mediatab.py
+++ b/openlp/plugins/media/lib/mediatab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate
+from openlp.core.lib import SettingsTab, str_to_bool
 
 class MediaTab(SettingsTab):
     """
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index f5150827a..abbf83ac2 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -27,7 +27,7 @@ import os
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, translate, BaseListWithDnD
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD
 from openlp.plugins.presentations.lib import MessageListener
 
 # We have to explicitly create separate classes for each plugin
diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py
index 33eb78eb9..410e3cde9 100644
--- a/openlp/plugins/presentations/lib/presentationtab.py
+++ b/openlp/plugins/presentations/lib/presentationtab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab
 
 class PresentationTab(SettingsTab):
     """
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index aee3c57a2..a1f473c7c 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab
 
 class RemoteTab(SettingsTab):
     """
diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py
index d9bfde967..f42de7b1b 100644
--- a/openlp/plugins/songs/forms/authorsdialog.py
+++ b/openlp/plugins/songs/forms/authorsdialog.py
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_AuthorsDialog(object):
     def setupUi(self, AuthorsDialog):
diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index 967a8de50..be5999f7b 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -23,7 +23,7 @@
 ###############################################################################
 
 from PyQt4 import QtGui, QtCore
-from openlp.core.lib import translate
+
 from openlp.plugins.songs.forms.authorsdialog import Ui_AuthorsDialog
 
 class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index 855566ed4..9d4ad6fcc 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_EditSongDialog(object):
     def setupUi(self, EditSongDialog):
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index e46d2dfa2..c501403c4 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -26,7 +26,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver
 from openlp.plugins.songs.forms import EditVerseForm
 from openlp.plugins.songs.lib.models import Song
 from editsongdialog import Ui_EditSongDialog
diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py
index b0889515d..f69a2fe6f 100644
--- a/openlp/plugins/songs/forms/editversedialog.py
+++ b/openlp/plugins/songs/forms/editversedialog.py
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_EditVerseDialog(object):
     def setupUi(self, EditVerseDialog):
diff --git a/openlp/plugins/songs/forms/openlpexportform.py b/openlp/plugins/songs/forms/openlpexportform.py
index 48a1303f4..a4bcffe2a 100644
--- a/openlp/plugins/songs/forms/openlpexportform.py
+++ b/openlp/plugins/songs/forms/openlpexportform.py
@@ -22,7 +22,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
+
 from openlp.plugins.songs.forms.openlpexportdialog import Ui_OpenLPExportDialog
 
 class OpenLPExportForm(QtGui.QDialog, Ui_OpenLPExportDialog):
diff --git a/openlp/plugins/songs/forms/openlpimportform.py b/openlp/plugins/songs/forms/openlpimportform.py
index 6254226eb..e8cc92818 100644
--- a/openlp/plugins/songs/forms/openlpimportform.py
+++ b/openlp/plugins/songs/forms/openlpimportform.py
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.plugins.songs.forms.openlpimportdialog import Ui_OpenLPImportDialog
 
 class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog):
@@ -30,4 +30,3 @@ class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog):
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-
diff --git a/openlp/plugins/songs/forms/opensongexportform.py b/openlp/plugins/songs/forms/opensongexportform.py
index 4f6fddcf1..b5246cf74 100644
--- a/openlp/plugins/songs/forms/opensongexportform.py
+++ b/openlp/plugins/songs/forms/opensongexportform.py
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.plugins.songs.forms.opensongexportdialog import Ui_OpenSongExportDialog
 
 class OpenSongExportForm(QtGui.QDialog, Ui_OpenSongExportDialog):
diff --git a/openlp/plugins/songs/forms/opensongimportform.py b/openlp/plugins/songs/forms/opensongimportform.py
index 80418f961..ed617626a 100644
--- a/openlp/plugins/songs/forms/opensongimportform.py
+++ b/openlp/plugins/songs/forms/opensongimportform.py
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.plugins.songs.forms.opensongimportdialog import Ui_OpenSongImportDialog
 
 class OpenSongImportForm(QtGui.QDialog, Ui_OpenSongImportDialog):
diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py
index 10f560a58..786a019b9 100644
--- a/openlp/plugins/songs/forms/songbookdialog.py
+++ b/openlp/plugins/songs/forms/songbookdialog.py
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_SongBookDialog(object):
     def setupUi(self, SongBookDialog):
diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py
index a662749df..4482e6d3a 100644
--- a/openlp/plugins/songs/forms/songbookform.py
+++ b/openlp/plugins/songs/forms/songbookform.py
@@ -24,7 +24,6 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
 from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
 
 class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index 7de15fb4f..f3ba1fce0 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_SongMaintenanceDialog(object):
     def setupUi(self, SongMaintenanceDialog):
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index c73452282..4c83b41e5 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 from PyQt4 import QtGui, QtCore
-from openlp.core.lib import translate
+
 from openlp.plugins.songs.lib.classes import Author, Book, Topic
 from songmaintenancedialog import Ui_SongMaintenanceDialog
 from authorsform import AuthorsForm
diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py
index f66b1c222..9f4546b04 100644
--- a/openlp/plugins/songs/forms/topicsdialog.py
+++ b/openlp/plugins/songs/forms/topicsdialog.py
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_TopicsDialog(object):
     def setupUi(self, TopicsDialog):
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index f7b8fc56a..afa67c2db 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -24,7 +24,6 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
 from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
 
 class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 7a72be2a1..9f3bc5638 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -26,7 +26,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \
+from openlp.core.lib import MediaManagerItem, SongXMLParser, \
     BaseListWithDnD, Receiver,  str_to_bool
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
 
diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py
index 864e97e59..d221e987d 100644
--- a/openlp/plugins/songs/lib/songstab.py
+++ b/openlp/plugins/songs/lib/songstab.py
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate
+from openlp.core.lib import SettingsTab, str_to_bool
 
 class SongsTab(SettingsTab):
     """
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 21eb832d1..6b19b0276 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -26,7 +26,7 @@ import logging
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, translate, buildIcon
+from openlp.core.lib import Plugin, buildIcon
 from openlp.plugins.songs.lib import SongManager, SongMediaItem, SongsTab
 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
     OpenSongImportForm, OpenLPExportForm