diff --git a/addon.xml b/addon.xml
index 54c1595..0a115b7 100755
--- a/addon.xml
+++ b/addon.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.youtube" name="YouTube" version="5.3.0" provider-name="jdf76, bromix">
+<addon id="plugin.video.youtube" name="YouTube" version="5.3.1" provider-name="jdf76, bromix">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
-        <import addon="script.module.urlresolver" optional="true"/>
 	</requires>
 	<extension point="xbmc.python.pluginsource" library="default.py">
 		<provides>video</provides>
@@ -15,7 +14,6 @@
 - Added 'Subtitle language(s) to download' selection to Settings -> General
 - API key set switching from Settings -> API (this will log you out)
 - Dual login only required if My Subscriptions folder is enabled at sign-in
-- Added optional URLResolver (Debrid) support to Settings -> Advanced -> Enable URLResolver (Debrid) support
         </news>
         <assets>
             <icon>icon.png</icon>
diff --git a/resources/language/Bulgarian/strings.po b/resources/language/Bulgarian/strings.po
index 4f59b4e..7cefb6c 100755
--- a/resources/language/Bulgarian/strings.po
+++ b/resources/language/Bulgarian/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Любими"
diff --git a/resources/language/Chinese (Traditional)/strings.po b/resources/language/Chinese (Traditional)/strings.po
index 0682dc1..04317d4 100755
--- a/resources/language/Chinese (Traditional)/strings.po	
+++ b/resources/language/Chinese (Traditional)/strings.po	
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "我的收藏"
diff --git a/resources/language/Czech/strings.po b/resources/language/Czech/strings.po
index 6b1facb..60a116a 100755
--- a/resources/language/Czech/strings.po
+++ b/resources/language/Czech/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Oblíbené"
diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po
index 7eb3f07..e7d0ecc 100644
--- a/resources/language/Dutch/strings.po
+++ b/resources/language/Dutch/strings.po
@@ -158,14 +158,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 #Kodion Common
 #empty strings from id 30037 to 30099
 
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index c2f69d0..31535e4 100755
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -166,16 +166,8 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver (Debrid) support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 #Kodion Common
-#empty strings from id 30041 to 30099
+#empty strings from id 30039 to 30099
 
 msgctxt "#30100"
 msgid "Favorites"
diff --git a/resources/language/French/strings.po b/resources/language/French/strings.po
index bfe444e..ae61e06 100755
--- a/resources/language/French/strings.po
+++ b/resources/language/French/strings.po
@@ -158,14 +158,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 #Kodion Common
 #empty strings from id 30037 to 30099
 
diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index b0508a9..7402d60 100755
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Favoriten"
diff --git a/resources/language/Greek/strings.po b/resources/language/Greek/strings.po
index 2b2b315..39c68f1 100644
--- a/resources/language/Greek/strings.po
+++ b/resources/language/Greek/strings.po
@@ -164,14 +164,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr "Τροποποιημένο ID λίστας αναπαραγωγής"
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr "Ενεργοποίηση υποστήριξης URLResolver Derbid"
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr "Ρύθμιση URLResolver"
-
 #Kodion Common
 #empty strings from id 30037 to 30099
 
diff --git a/resources/language/Hebrew/strings.po b/resources/language/Hebrew/strings.po
index 4cb71c2..59f9649 100755
--- a/resources/language/Hebrew/strings.po
+++ b/resources/language/Hebrew/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "מועדפים"
diff --git a/resources/language/Hungarian/strings.po b/resources/language/Hungarian/strings.po
index bd8af9c..bedd879 100755
--- a/resources/language/Hungarian/strings.po
+++ b/resources/language/Hungarian/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Kedvencek"
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index 2c23791..2ecd649 100755
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Preferiti"
diff --git a/resources/language/Korean/strings.po b/resources/language/Korean/strings.po
index fce65a9..5212e82 100755
--- a/resources/language/Korean/strings.po
+++ b/resources/language/Korean/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "즐겨찾기"
diff --git a/resources/language/Norwegian/strings.po b/resources/language/Norwegian/strings.po
index 355e169..fce1c80 100644
--- a/resources/language/Norwegian/strings.po
+++ b/resources/language/Norwegian/strings.po
@@ -166,14 +166,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 #Kodion Common
 #empty strings from id 30038 to 30099
 
diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po
index fe82cb8..0241616 100755
--- a/resources/language/Polish/strings.po
+++ b/resources/language/Polish/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Ulubione"
diff --git a/resources/language/Portuguese/strings.po b/resources/language/Portuguese/strings.po
index c658d4d..af8d4f3 100755
--- a/resources/language/Portuguese/strings.po
+++ b/resources/language/Portuguese/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Favoritos"
diff --git a/resources/language/Romanian/strings.po b/resources/language/Romanian/strings.po
index 6dec12f..727c08e 100755
--- a/resources/language/Romanian/strings.po
+++ b/resources/language/Romanian/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Favorite"
diff --git a/resources/language/Russian/strings.po b/resources/language/Russian/strings.po
index 5496c64..15f0b12 100755
--- a/resources/language/Russian/strings.po
+++ b/resources/language/Russian/strings.po
@@ -158,14 +158,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 #Kodion Common
 #empty strings from id 30037 to 30099
 
diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po
index 0c2d799..8b2172b 100755
--- a/resources/language/Slovak/strings.po
+++ b/resources/language/Slovak/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Obľúbené"
diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po
index c7fab37..a79ef43 100755
--- a/resources/language/Spanish/strings.po
+++ b/resources/language/Spanish/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Favoritos"
diff --git a/resources/language/Ukrainian/strings.po b/resources/language/Ukrainian/strings.po
index e57f33f..7633c74 100755
--- a/resources/language/Ukrainian/strings.po
+++ b/resources/language/Ukrainian/strings.po
@@ -152,14 +152,6 @@ msgctxt "#30038"
 msgid "Custom History Playlist ID"
 msgstr ""
 
-msgctxt "#30039"
-msgid "Enable URLResolver Debrid support"
-msgstr ""
-
-msgctxt "#30040"
-msgid "Configure URLResolver"
-msgstr ""
-
 msgctxt "#30100"
 msgid "Favorites"
 msgstr "Обране"
diff --git a/resources/lib/kodion/constants/const_settings.py b/resources/lib/kodion/constants/const_settings.py
index 6cefb5c..a191490 100755
--- a/resources/lib/kodion/constants/const_settings.py
+++ b/resources/lib/kodion/constants/const_settings.py
@@ -7,7 +7,6 @@
 VIDEO_QUALITY = 'kodion.video.quality'  # (int)
 VIDEO_QUALITY_ASK = 'kodion.video.quality.ask'  # (bool)
 USE_DASH = 'kodion.video.quality.mpd'  # (bool)
-DEBRID_SUPPORT = 'kodion.support.urlresolver_debrid'  # (bool)
 SUBTITLE_LANGUAGES = 'kodion.subtitle.languages'  # (int)
 SETUP_WIZARD = 'kodion.setup_wizard'  # (bool)
 
diff --git a/resources/lib/kodion/impl/abstract_settings.py b/resources/lib/kodion/impl/abstract_settings.py
index 427b249..3b64dd2 100755
--- a/resources/lib/kodion/impl/abstract_settings.py
+++ b/resources/lib/kodion/impl/abstract_settings.py
@@ -101,6 +101,3 @@ def subtitle_languages(self):
 
     def requires_dual_login(self):
         return self.get_bool('youtube.folder.my_subscriptions.show', True)
-
-    def use_debrid(self):
-        return self.get_bool(constants.setting.DEBRID_SUPPORT, False)
diff --git a/resources/lib/youtube/helper/yt_play.py b/resources/lib/youtube/helper/yt_play.py
index 97116a8..de0893d 100755
--- a/resources/lib/youtube/helper/yt_play.py
+++ b/resources/lib/youtube/helper/yt_play.py
@@ -20,41 +20,15 @@ def play_video(provider, context, re_match):
             context.get_ui().show_notification(message, time_milliseconds=5000)
             return False
 
-        video_stream = None
-        if context.get_settings().use_debrid():
-            import urlresolver
-            resolver_url = 'http://youtube.com/watch?v=%s' % video_id
-            hmf = urlresolver.HostedMediaFile(url=resolver_url)
-            resolved = hmf.resolve()
-            if not resolved or not isinstance(resolved, basestring):
-                try:
-                    message = resolved.msg
-                except:
-                    message = 'Reason unknown, refer to URLResolver debug logging.'
-                context.log_warning('URLResolver unable to resolve: %s\n%s' % (resolver_url, message))
-            elif resolved.startswith('plugin://'):
-                context.log_warning('URLResolver unusable result: %s\nCheck the log above for debrid resolver errors, '
-                                    'confirm debrid resolver is enabled, and has a lower number set in the priority '
-                                    'setting than the YouTube(or offending) resolver.' % resolved)
-            else:
-                video_stream = {'container': 'URLResolver',
-                                'title': video_streams[0]['title'],
-                                'url': resolved,
-                                'meta': video_streams[0]['meta'],
-                                'video': {'encoding': '', 'height': 0},
-                                'audio': {'bitrate': 0, 'encoding': ''}}
-                context.log_debug('URLResolver resolved now using video_stream:\n%s' % video_stream)
-
-        if not video_stream:
-            video_stream = kodion.utils.select_stream(context, video_streams)
-
-            if video_stream is None:
-                return False
-
-            if video_stream['video'].get('rtmpe', False):
-                message = context.localize(provider.LOCAL_MAP['youtube.error.rtmpe_not_supported'])
-                context.get_ui().show_notification(message, time_milliseconds=5000)
-                return False
+        video_stream = kodion.utils.select_stream(context, video_streams)
+
+        if video_stream is None:
+            return False
+
+        if video_stream['video'].get('rtmpe', False):
+            message = context.localize(provider.LOCAL_MAP['youtube.error.rtmpe_not_supported'])
+            context.get_ui().show_notification(message, time_milliseconds=5000)
+            return False
 
         video_item = VideoItem(video_id, video_stream['url'])
 
diff --git a/resources/lib/youtube/provider.py b/resources/lib/youtube/provider.py
index a17417c..00e3054 100755
--- a/resources/lib/youtube/provider.py
+++ b/resources/lib/youtube/provider.py
@@ -491,9 +491,6 @@ def configure_mpd_inputstream(self, context, re_match):
             context._addon.openSettings()
         elif switch == 'mpd':
             xbmcaddon.Addon(id='inputstream.mpd').openSettings()
-        elif switch == 'urlresolver':
-            import urlresolver
-            urlresolver.display_settings()
         else:
             return False
 
diff --git a/resources/settings.xml b/resources/settings.xml
index f9cea7a..845272b 100755
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -41,8 +41,6 @@
 
     <category label="30031">
         <setting id="kodion.support.alternative_player" type="bool" label="30036" default="false"/>
-        <setting id="kodion.support.urlresolver_debrid" type="bool" label="30039" default="false" enable="System.HasAddon(script.module.urlresolver)"/>
-        <setting id="kodion.urlresolver.configure" type="action" label="30040"  option="close" enable="eq(-1,true)" visible="eq(-1,true)" action="RunPlugin(plugin://plugin.video.youtube/config/urlresolver/)"/>
         <setting id="youtube.view.description.show_channel_name" type="bool" label="30541" default="true"/>
         <setting type="sep" />
         <setting id="kodion.view.override" type="bool" label="30026" default="false"/>