diff --git a/servers/bravoporn.json b/servers/bravoporn.json
deleted file mode 100644
index 4a53efe8..00000000
--- a/servers/bravoporn.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://www.bravoporn.com/videos/[0-9]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://www.bravotube.net/videos/[A-z0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://xcafe.com/[0-9]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://es.anyporn.com/[0-9]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://www.alphaporno.com/videos/[A-z0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://xbabe.com/videos/[A-z0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://xcum.com/v/[0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://sex3.com/[0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://www.tubewolf.com/movies/[A-z0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://anysex.com/[0-9]+/)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "bravoporn",
-  "name": "bravoporn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/bravoporn.py b/servers/bravoporn.py
deleted file mode 100644
index f4ac400f..00000000
--- a/servers/bravoporn.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data, server
-    data = httptools.downloadpage(page_url).data
-    server = scrapertools.find_single_match(page_url, 'https://(?:www.|es.|)([A-z0-9-]+).(?:com|net)')
-    if "<h2>WE ARE SORRY</h2>" in data or '<title>404 Not Found</title>' in data:
-        return False, "[%s] El fichero no existe o ha sido borrado" %server
-    return True, ""
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    patron  = '<source (?:id="video_source_\d+" |data-fluid-hd |)src="([^"]+)".*?title="([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url,quality in matches:
-        url += "|Referer=%s" % page_url
-        logger.debug(url)
-        video_urls.append(["[%s] %s" %(server,quality), url])
-    return video_urls
diff --git a/servers/datoporn.json b/servers/datoporn.json
deleted file mode 100644
index ea87894b..00000000
--- a/servers/datoporn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:datoporn.com|dato.porn|datoporn.co)/(?:embed-|)([A-z0-9]+)",
-        "url": "http://dato.porn/embed-\\1.html"
-      }
-    ]
-  },
-  "free": true,
-  "id": "datoporn",
-  "name": "datoporn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "http://i.imgur.com/tBSWudd.png?1"
-}
diff --git a/servers/datoporn.py b/servers/datoporn.py
deleted file mode 100755
index f433731e..00000000
--- a/servers/datoporn.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from lib import jsunpack
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-
-    data = httptools.downloadpage(page_url).data
-
-    if 'Not Found' in data or 'File is no longer available' in data:
-        return False,  config.get_localized_string(70449) % "Datoporn"
-
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    media_urls = scrapertools.find_multiple_matches(data, 'src: "([^"]+)",.*?label: "([^"]+)"')
-    if not media_urls:
-        match = scrapertools.find_single_match(data, "<script type='text/javascript'>(eval.function.p,a,c,k,e,d..*?)</script>")
-        try:
-            data = jsunpack.unpack(match)
-        except:
-            pass
-        media_urls = scrapertools.find_multiple_matches(data, 'file\:"([^"]+\.mp4)",label:"([^"]+)"')
-    # Extrae la URL
-    for media_url, res in media_urls:
-        try:
-            title = ".%s %s [datoporn]" % (media_url.rsplit('.', 1)[1], res)
-        except:
-            title = ".%s %s [datoporn]" % (media_url[-4:], res)
-        video_urls.append([title, media_url])
-    m3u8 = scrapertools.find_single_match(data, 'src\:"([^"]+\.m3u8)"')
-    if not m3u8:
-        m3u8 = str(scrapertools.find_multiple_matches(data, 'player.updateSrc\({src:.?"([^"]+\.m3u8)"')).replace("['", "").replace("']", "")
-        calidades = ['720p']
-    if m3u8:
-        video_urls.insert(0, [".m3u8 720p [datoporn]" ,  m3u8])
-    for video_url in video_urls:
-        logger.info("%s - %s" % (video_url[0], video_url[1]))
-    return video_urls
diff --git a/servers/eporner.json b/servers/eporner.json
deleted file mode 100644
index c288a1f3..00000000
--- a/servers/eporner.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://www.eporner.com/hd-porn/[A-z0-9-]+/[A-z0-9-]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "eporner",
-  "name": "eporner",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/eporner.py b/servers/eporner.py
deleted file mode 100644
index d25b006a..00000000
--- a/servers/eporner.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-
-from core import httptools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data
-    data = httptools.downloadpage(page_url).data
-    if "<h2>WE ARE SORRY</h2>" in data or '<title>404 Not Found</title>' in data:
-        return False,  config.get_localized_string(70449) % "eporner"
-    return True, ""
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    data = re.sub(r"\n|\r|\t|&nbsp;|<br>|<br/>", "", data)
-    patron = "EP: {vid: '([^']+)',hash: '([^']+)'"
-    vid, hash = re.compile(patron, re.DOTALL).findall(data)[0]
-    hash = int_to_base36(int(hash[0:8], 16)) + int_to_base36(int(hash[8:16], 16)) + int_to_base36(
-        int(hash[16:24], 16)) + int_to_base36(int(hash[24:32], 16))
-    url = "https://www.eporner.com/xhr/video/%s?hash=%s" % (vid, hash)
-    jsondata = httptools.downloadpage(url).json
-    for source in jsondata["sources"]["mp4"]:
-        url = jsondata["sources"]["mp4"][source]["src"]
-        title = source.split(" ")[0]
-        video_urls.append(["[eporner] %s"% title, url])
-    return video_urls
-    # return sorted(video_urls, key=lambda i: int(i[0].split("p")[1]))
-
-
-
-
-def int_to_base36(num):
-    """Converts a positive integer into a base36 string."""
-    assert num >= 0
-    digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.lower()
-
-    res = ''
-    while not res or num > 0:
-        num, i = divmod(num, 36)
-        res = digits[i] + res
-    return res
-
diff --git a/servers/gotporn.json b/servers/gotporn.json
deleted file mode 100644
index 3cc0dfd4..00000000
--- a/servers/gotporn.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://www.gotporn.com/[A-z0-9-]+/[A-z0-9-]+)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://mylust.com/videos/[0-9]+/[A-z0-9-]+/)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://www.stileproject.com/embed/[0-9]+)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://www.pornwatchers.com/embed/[0-9]+)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(https://www.pornrabbit.com/embed/[0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "gotporn",
-  "name": "gotporn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/gotporn.py b/servers/gotporn.py
deleted file mode 100644
index 0b38b366..00000000
--- a/servers/gotporn.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data
-    data = httptools.downloadpage(page_url).data
-    if "<h2>WE ARE SORRY</h2>" in data or '<title>404 Not Found</title>' in data:
-        return False,  config.get_localized_string(70449) % "Mixdrop"
-    return True, ""
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    url = scrapertools.find_single_match(data,'<source (?:id="video_source_\d+" |)src="([^"]+)" type=(?:\'|")video/mp4(?:\'|")')
-    host = scrapertools.find_single_match(page_url, '(https://.*?.com)')
-    url += "|Referer=%s" % host
-    logger.debug(url)
-    server = scrapertools.find_single_match(page_url, 'https://(?:www.|)([A-z0-9-]+).com')
-    video_urls.append(["[%s]" %server, url])
-    return video_urls
diff --git a/servers/iceporn.json b/servers/iceporn.json
deleted file mode 100644
index dc380c9e..00000000
--- a/servers/iceporn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "http://www.iceporn.com/embed/([0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "iceporn",
-  "name": "iceporn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/iceporn.py b/servers/iceporn.py
deleted file mode 100644
index 716a5362..00000000
--- a/servers/iceporn.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    url = "https://www.iceporn.com/player_config_json/?vid=%s&aid=0&domain_id=0&embed=0&ref=null&check_speed=0" %page_url
-    data = httptools.downloadpage(url).data
-    data = scrapertools.find_single_match(data, '"files":(.*?)"quality"')
-    patron  = '"([lh])q":"([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for quality, scrapedurl in matches:
-        url =  scrapedurl.replace("\/", "/")
-        if "l" in quality: quality = "360"
-        if "h" in quality: quality = "720"
-        video_urls.append(["[iceporn] %s" %quality, url])
-    return video_urls
-
diff --git a/servers/pornhub.json b/servers/pornhub.json
deleted file mode 100644
index cc08c749..00000000
--- a/servers/pornhub.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://(?:www.|)pornhub.com/embed/([A-z0-9]+)",
-        "url": "https://www.pornhub.com/view_video.php?viewkey=\\1"
-      },
-      {
-        "pattern": "(https://www.pornhub.com/view_video.php?viewkey=[A-z0-9]+)",
-        "url": "\\1"
-      },
-      {
-        "pattern": "(pornhub.com/view_video.php\\?viewkey=[A-z0-9]+)",
-        "url": "https://www.\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "pornhub",
-  "name": "pornhub",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/pornhub.py b/servers/pornhub.py
deleted file mode 100644
index 91e50222..00000000
--- a/servers/pornhub.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector pornhub By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    response = httptools.downloadpage(page_url)
-    if not response.sucess or \
-       "Not Found" in response.data \
-       or "File was deleted" in response.data \
-       or "removed" in response.data \
-       or not "defaultQuality" in response.data \
-       or "is no longer available" in response.data:
-        return False,  config.get_localized_string(70449) % "pornhub"
-    return True, ""
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info()
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    data = scrapertools.find_single_match(data, '<div id="vpContentContainer">(.*?)</script>')
-    data = data.replace('" + "', '')
-    videourl = scrapertools.find_multiple_matches(data, 'var quality_(\d+)p=(.*?);')
-    scrapertools.printMatches(videourl)
-    for scrapedquality,scrapedurl in videourl:
-        orden = scrapertools.find_multiple_matches(scrapedurl, '\*\/([A-z0-9]+)')
-        logger.debug(orden)
-        url= ""
-        for i in orden:
-            url += scrapertools.find_single_match(data, '%s="([^"]+)"' %i)
-        logger.debug(url)
-        video_urls.append([scrapedquality + "p [pornhub]", url])
-    return video_urls
diff --git a/servers/pornrewind.json b/servers/pornrewind.json
deleted file mode 100644
index da36adf5..00000000
--- a/servers/pornrewind.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://www.pornrewind.com/embed/\\w+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "pornrewind",
-  "name": "pornrewind",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/pornrewind.py b/servers/pornrewind.py
deleted file mode 100644
index d7132fc0..00000000
--- a/servers/pornrewind.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector pornrewind By Alfa development Group
-# --------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-
-    response = httptools.downloadpage(page_url)
-
-    if not response.sucess or \
-       "Not Found" in response.data \
-       or "File was deleted" in response.data \
-       or "is no longer available" in response.data:
-        return False,  config.get_localized_string(70449) % "pornrewind"
-
-    global video_url, license_code
-    video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'")
-    license_code = scrapertools.find_single_match(response.data, "license_code: '([^']+)'")
-
-    return True, ""
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    # mediaurl = decode(video_url, license_code)
-    mediaurl = video_url
-    if not mediaurl.startswith("https"):
-        mediaurl = "https://%s" % mediaurl
-    return [["[pornrewind]", mediaurl]]
\ No newline at end of file
diff --git a/servers/txxx.json b/servers/txxx.json
deleted file mode 100644
index 9f8e3046..00000000
--- a/servers/txxx.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://(?:www.|)txxx.com/(?:embed|videos)/([0-9]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "txxx",
-  "name": "txxx",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/txxx.py b/servers/txxx.py
deleted file mode 100644
index d678566c..00000000
--- a/servers/txxx.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    url= "https://txxx.com/api/videofile.php?video_id=%s&lifetime=864000" % page_url
-    ref= "https://txxx.com/embed/%s/" % page_url
-    headers = {'Referer': ref}
-    data = httptools.downloadpage(url, headers=headers).data
-    texto = scrapertools.find_single_match(data, '"video_url":"([^"]+)"')
-    url = dec_url(texto)
-    url = "https://txxx.com%s" % url
-    url = httptools.downloadpage(url, only_headers=True).url
-    video_urls.append(["[TXX]", url])
-    return video_urls
-
-
-def dec_url(txt):
-    #truco del mendrugo
-    # txt = txt.replace('\u0410', 'A').replace('\u0412', 'B').replace('\u0421', 'C').replace('\u0415', 'E').replace('\u041c', 'M').replace('~', '=').replace(',','/')
-    txt = txt.decode('unicode-escape').encode('utf8')
-    txt = txt.replace('А', 'A').replace('В', 'B').replace('С', 'C').replace('Е', 'E').replace('М', 'M').replace('~', '=').replace(',','/')
-    import base64
-    url = base64.b64decode(txt)
-    return url
diff --git a/servers/vipporns.json b/servers/vipporns.json
deleted file mode 100644
index f83d9898..00000000
--- a/servers/vipporns.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://(?:www|).vipporns.com/embed/\\w+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "vipporns",
-  "name": "vipporns",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/vipporns.py b/servers/vipporns.py
deleted file mode 100644
index cb94dc10..00000000
--- a/servers/vipporns.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector vipporns By Alfa development Group
-# --------------------------------------------------------
-from lib.kt_player import decode
-
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-
-    response = httptools.downloadpage(page_url)
-
-    if not response.sucess or \
-       "Not Found" in response.data \
-       or "File was deleted" in response.data \
-       or "is no longer available" in response.data:
-        return False,  config.get_localized_string(70449) % "vipporns"
-
-    global video_url, license_code
-    video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'")
-    license_code = scrapertools.find_single_match(response.data, "license_code: '([^']+)'")
-
-    return True, ""
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info()
-    return [["[vipporns]", decode(video_url, license_code)]]
\ No newline at end of file
diff --git a/servers/winporn.json b/servers/winporn.json
deleted file mode 100644
index 9e102009..00000000
--- a/servers/winporn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://www.winporn.com/es/video/([0-9]+)/",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "winporn",
-  "name": "winporn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/winporn.py b/servers/winporn.py
deleted file mode 100644
index 74db631e..00000000
--- a/servers/winporn.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    url = "https://www.winporn.com/player_config_json/?vid=%s&aid=0&domain_id=0&embed=0&ref=null&check_speed=0" %page_url
-    data = httptools.downloadpage(url).data
-    data = scrapertools.find_single_match(data, '"files":(.*?)"quality"')
-    patron  = '"([lh])q":"([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for quality, scrapedurl in matches:
-        url =  scrapedurl.replace("\/", "/")
-        if "l" in quality: quality = "360"
-        if "h" in quality: quality = "720"
-        video_urls.append(["[winporn] %s" %quality, url])
-    return video_urls
-
diff --git a/servers/xdrive.json b/servers/xdrive.json
deleted file mode 100644
index 5df04ffc..00000000
--- a/servers/xdrive.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://xdrive.cc/embed/([A-z0-9]+)",
-        "url": "https://xdrive.cc/embed/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "xdrive",
-  "name": "xdrive",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://i.postimg.cc/MHyNdRPZ/xdrive.png"
-}
diff --git a/servers/xdrive.py b/servers/xdrive.py
deleted file mode 100644
index 5baaeab4..00000000
--- a/servers/xdrive.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# Alfa addon - KODI Plugin
-# Conector para xdrive
-# https://github.com/alfa-addon
-# ------------------------------------------------------------
-from core import httptools
-from core import scrapertools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "Object not found" in data or "no longer exists" in data or '"sources": [false]' in data:
-        return False,  config.get_localized_string(70449) % "xdrive"
-
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data1 = httptools.downloadpage("https://xdrive.cc/geo_ip").data
-    _ip = scrapertools.find_single_match(data1, 'ip":"([^"]+)')
-    data = httptools.downloadpage(page_url).data
-    video_id = scrapertools.find_single_match(data, '&video_id=(\d+)')
-    data = httptools.downloadpage("https://xdrive.cc/secure_link?ip=%s&video_id=%s" %(_ip, video_id)).data.replace("\\","")
-    videourl = scrapertools.find_multiple_matches(data, '"([^"]+)"')
-    for scrapedurl in videourl:
-        video_urls.append(["[xdrive]", scrapedurl])
-    return video_urls
diff --git a/servers/xhamster.json b/servers/xhamster.json
deleted file mode 100644
index 359ddc2f..00000000
--- a/servers/xhamster.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(?:http|s)://xhamster.com/(?:xembed.php\\?video=|embed/)([0-9]+)",
-        "url": "https://xhamster.com/embed/\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "xhamster",
-  "name": "xhamster",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/xhamster.py b/servers/xhamster.py
deleted file mode 100644
index df46152f..00000000
--- a/servers/xhamster.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    patron = '"fallback":"([^"]+)","quality":"([0-9]+p)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, quality  in matches:
-        url =  scrapedurl.replace("\/", "/")
-        video_urls.append(["[xhamster] %s" %quality, url])
-    return video_urls
diff --git a/servers/xstreamcdn.json b/servers/xstreamcdn.json
deleted file mode 100644
index 80115bba..00000000
--- a/servers/xstreamcdn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://www.xstreamcdn.com/v/[A-z0-9_-]+)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "xstreamcdn",
-  "name": "xstreamcdn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": "https://library.vodkr.com/media/24364/xstreamlogo.jpg"
-}
diff --git a/servers/xstreamcdn.py b/servers/xstreamcdn.py
deleted file mode 100644
index 27310f4d..00000000
--- a/servers/xstreamcdn.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import sys
-PY3 = False
-if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
-
-if PY3:
-    #from future import standard_library
-    #standard_library.install_aliases()
-    import urllib.parse as urllib                               # Es muy lento en PY2.  En PY3 es nativo
-else:
-    import urllib                                               # Usamos el nativo de PY2 que es más rápido
-
-from core import httptools
-from core import scrapertools
-from core import jsontools
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    if "ile was deleted" in data or "Page Cannot Be Found" in data or "<title>Sorry 404 not found" in data:
-        return False, "[xstreamcdn.com] El archivo ha sido eliminado o no existe"
-    return True, ""
-
-
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-    logger.info("url=" + page_url)
-    video_urls = []
-    post = {}
-    post = urllib.urlencode(post)
-    data = httptools.downloadpage("https://xstreamcdn.com/api/source/" + scrapertools.find_single_match(page_url, "/v/([A-z0-9_-]+)"), post=post, add_referer=page_url).data
-    
-    json_data = jsontools.load(data)
-    check = json_data['success']
-    if check == True:
-        for element in json_data['data']:
-            media_url = element['file']
-            res = element['label']
-            tipo = element['type']
-            video_urls.append([tipo + " (" + res + ") [xstreamcdn]", media_url])
-    return video_urls
diff --git a/servers/xvideos.json b/servers/xvideos.json
deleted file mode 100755
index b09288ab..00000000
--- a/servers/xvideos.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "https://(?:flashservice|www).xvideos.com/embedframe/([0-9]+)",
-        "url": "https://www.xvideos.com/video\\1/"
-      },
-      {
-        "pattern": "https://www.xvideos.com/video([0-9]+)/",
-        "url": "https://www.xvideos.com/video\\1/"
-      },
-      {
-        "pattern": "http://www.xvideos.com/video([0-9]+)/",
-        "url": "https://www.xvideos.com/video\\1/"
-      }
-    ]
-  },
-  "free": true,
-  "id": "xvideos",
-  "name": "xvideos",
-  "premium": [
-    "alldebrid"
-  ],
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ]
-}
diff --git a/servers/xvideos.py b/servers/xvideos.py
deleted file mode 100755
index 947376df..00000000
--- a/servers/xvideos.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-
-from core import httptools
-from platformcode import config
-from platformcode import logger
-
-
-def test_video_exists(page_url):
-    logger.info("(page_url='%s')" % page_url)
-    global data
-    
-    data = httptools.downloadpage(page_url).data
-    if "Lo sentimos" in data or "File not found" in data or 'og:video">' in data:
-        return False,  config.get_localized_string(70449) % "Xvideos"
-
-    return True, ""
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    patron = 'html5player.setVideo(?:Url|H)(\w+)\(\'([^\']+)\'\)'
-    matches = re.compile(patron,re.DOTALL).findall(data)
-    for quality,url in matches:
-        if "LS" in quality: quality = "HLS"
-        video_urls.append(["[xvideos] %s" %quality, url])
-    return video_urls
diff --git a/servers/youporn.json b/servers/youporn.json
deleted file mode 100644
index eb40da00..00000000
--- a/servers/youporn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://www.youporn.com/(?:embed|watch)/[0-9]+/[A-z0-9-]+/)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "youporn",
-  "name": "youporn",
-  "settings": [
-    {
-      "default": false,
-      "enabled": true,
-      "id": "black_list",
-      "label": "@60654",
-      "type": "bool",
-      "visible": true
-    },
-    {
-      "default": 0,
-      "enabled": true,
-      "id": "favorites_servers_list",
-      "label": "@60655",
-      "lvalues": [
-        "No",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5"
-      ],
-      "type": "list",
-      "visible": false
-    }
-  ],
-  "thumbnail": ""
-}
diff --git a/servers/youporn.py b/servers/youporn.py
deleted file mode 100644
index ebc5d10f..00000000
--- a/servers/youporn.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-from core import httptools
-from core import scrapertools
-from platformcode import logger
-
-
-def get_video_url(page_url, video_password):
-    logger.info("(page_url='%s')" % page_url)
-    video_urls = []
-    data = httptools.downloadpage(page_url).data
-    patron  = '"format":"","quality":"([^"]+)","videoUrl":"([^"]+)"'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for quality, scrapedurl in matches:
-        url =  scrapedurl.replace("\/", "/").replace("\u0026", "&")
-        video_urls.append(["[youporn] %sp" %quality, url])
-    return video_urls