diff --git a/openlp/core/ui/media/vendor/vlc.py b/openlp/core/ui/media/vendor/vlc.py
index 102af034f..f56d3ef56 100644
--- a/openlp/core/ui/media/vendor/vlc.py
+++ b/openlp/core/ui/media/vendor/vlc.py
@@ -107,7 +107,6 @@ def find_lib():
         except OSError:  # may fail
             dll = ctypes.CDLL('libvlc.so.5')
     elif sys.platform.startswith('win'):
-        ctypes.windll.kernel32.SetDllDirectoryW(None)
         p = find_library('libvlc.dll')
         if p is None:
             try:  # some registry settings
diff --git a/openlp/plugins/songs/lib/songselect.py b/openlp/plugins/songs/lib/songselect.py
index e1641ae0c..d4993039b 100644
--- a/openlp/plugins/songs/lib/songselect.py
+++ b/openlp/plugins/songs/lib/songselect.py
@@ -28,9 +28,7 @@ from http.cookiejar import CookieJar
 from urllib.parse import urlencode
 from urllib.request import HTTPCookieProcessor, URLError, build_opener
 from html.parser import HTMLParser
-if sys.version_info > (3, 4):
-    from html import unescape
-
+from html import unescape
 
 from bs4 import BeautifulSoup, NavigableString
 
@@ -132,18 +130,11 @@ class SongSelectImport(object):
             if not search_results:
                 break
             for result in search_results:
-                if sys.version_info > (3, 4):
-                    song = {
-                        'title': unescape(result.find('h3').string),
-                        'authors': [unescape(author.string) for author in result.find_all('li')],
-                        'link': BASE_URL + result.find('a')['href']
-                    }
-                else:
-                    song = {
-                        'title': self.html_parser.unescape(result.find('h3').string),
-                        'authors': [self.html_parser.unescape(author.string) for author in result.find_all('li')],
-                        'link': BASE_URL + result.find('a')['href']
-                    }
+                song = {
+                    'title': unescape(result.find('h3').string),
+                    'authors': [unescape(author.string) for author in result.find_all('li')],
+                    'link': BASE_URL + result.find('a')['href']
+                }
                 if callback:
                     callback(song)
                 songs.append(song)
@@ -177,10 +168,7 @@ class SongSelectImport(object):
         if callback:
             callback()
         song['copyright'] = '/'.join([li.string for li in song_page.find('ul', 'copyright').find_all('li')])
-        if sys.version_info > (3, 4):
-            song['copyright'] = unescape(song['copyright'])
-        else:
-            song['copyright'] = self.html_parser.unescape(song['copyright'])
+        song['copyright'] = unescape(song['copyright'])
         song['ccli_number'] = song_page.find('ul', 'info').find('li').string.split(':')[1].strip()
         song['verses'] = []
         verses = lyrics_page.find('section', 'lyrics').find_all('p')
@@ -193,15 +181,9 @@ class SongSelectImport(object):
                 else:
                     verse['lyrics'] += '\n'
             verse['lyrics'] = verse['lyrics'].strip(' \n\r\t')
-            if sys.version_info > (3, 4):
-                song['verses'].append(unescape(verse))
-            else:
-                song['verses'].append(self.html_parser.unescape(verse))
+            song['verses'].append(unescape(verse))
         for counter, author in enumerate(song['authors']):
-            if sys.version_info > (3, 4):
-                song['authors'][counter] = unescape(author)
-            else:
-                song['authors'][counter] = self.html_parser.unescape(author)
+            song['authors'][counter] = unescape(author)
         return song
 
     def save_song(self, song):