diff --git a/servers/vup.json b/servers/vup.json
deleted file mode 100644
index 4c468694..00000000
--- a/servers/vup.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "active": true,
-  "find_videos": {
-    "ignore_urls": [],
-    "patterns": [
-      {
-        "pattern": "(https://vup.to/embed-[A-z0-9]+.html)",
-        "url": "\\1"
-      }
-    ]
-  },
-  "free": true,
-  "id": "vup",
-  "name": "VUP",
-  "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": "server_vupplayer.png"
-}
diff --git a/servers/vup.py b/servers/vup.py
deleted file mode 100644
index 9eba027d..00000000
--- a/servers/vup.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# --------------------------------------------------------
-# Conector vup By Alfa development Group
-# --------------------------------------------------------
-
-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)
-    data = httptools.downloadpage(page_url).data
-    if "no longer exists" in data or "to copyright issues" in data:
-        return False, "[vup] El video ha sido borrado"
-    return True, ""
-
-
-def get_video_url(page_url, user="", password="", video_password=""):
-    logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url).data
-    bloque = scrapertools.find_single_match(data, 'sources:.*?\]')
-    video_urls = []
-    videourl = scrapertools.find_multiple_matches(bloque, '"(http[^"]+)')
-    for video in videourl:
-        video_urls.append([".MP4 [vup]", video])
-    video_urls = video_urls[::-1]
-    return video_urls
diff --git a/servers/vupplayer.py b/servers/vupplayer.py
index 113a30e9..e348a184 100644
--- a/servers/vupplayer.py
+++ b/servers/vupplayer.py
@@ -7,6 +7,8 @@ from platformcode import logger, config
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
     data = httptools.downloadpage(page_url)
+    global data
+    data = data.data
     if data.code == 404:
         return False, config.get_localized_string(70449)
     return True, ""
@@ -15,8 +17,7 @@ def test_video_exists(page_url):
 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
-    logger.info('VUP DATA= '+ data)
+    global data
     patron = r'sources:\s*\[\{src:\s*"([^"]+)"'
     matches = scrapertools.find_multiple_matches(data, patron)
     for url in matches:
diff --git a/servers/wstream.json b/servers/wstream.json
index 99428674..72b1acbb 100644
--- a/servers/wstream.json
+++ b/servers/wstream.json
@@ -7,7 +7,7 @@
     "find_videos": {
         "patterns": [
             {
-                "pattern": "wstream\\.video.*?(?<!api)(?:=|/)(?:embed-)?(?<!streaming\\.php\\?id=)([a-z0-9A-Z]+)(?:[^/_.a-z0-9A-Z]|$)",
+                "pattern": "wstream\\.video(?!<).*?(?<!api)(?:=|/)(?:embed-)?(?<!streaming\\.php\\?id=)([a-z0-9A-Z]+)(?:[^/_.a-z0-9A-Z]|$)",
                 "url": "https://wstream.video/video.php?file_code=\\1"
             },
             {