diff --git a/plugin.video.alfa/channels/cuelgame.json b/plugin.video.alfa/channels/cuelgame.json
deleted file mode 100755
index b85a0b81..00000000
--- a/plugin.video.alfa/channels/cuelgame.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "id": "cuelgame",
-  "name": "Cuelgame",
-  "active": false,
-  "adult": false,
-  "language": ["cast"],
-  "thumbnail": "cuelgame.png",
-  "banner": "cuelgame.png",
-  "categories": [
-    "torrent",
-    "movie",
-    "tvshow",
-    "documentary",
-    "vos"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    },
-    {
-      "id": "include_in_newest_torrent",
-      "type": "bool",
-      "label": "Incluir en Novedades - Torrent",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
diff --git a/plugin.video.alfa/channels/cuelgame.py b/plugin.video.alfa/channels/cuelgame.py
deleted file mode 100755
index a6b4b641..00000000
--- a/plugin.video.alfa/channels/cuelgame.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import scrapertools, httptools
-from core.item import Item
-from core.scrapertools import decodeHtmlentities as dhe
-from platformcode import logger
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="[COLOR forestgreen]Videos[/COLOR]", action="scraper",
-                         url="http://cuelgame.net/?category=4",
-                         thumbnail="http://img5a.flixcart.com/image/poster/q/t/d/vintage-camera-collage-sr148-medium-400x400-imadkbnrnbpggqyz.jpeg",
-                         fanart="http://imgur.com/7frGoPL.jpg"))
-    itemlist.append(Item(channel=item.channel, title="[COLOR forestgreen]Buscar[/COLOR]", action="search", url="",
-                         thumbnail="http://images2.alphacoders.com/846/84682.jpg",
-                         fanart="http://imgur.com/1sIHN1r.jpg"))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    texto = texto.replace(" ", "+")
-    item.url = "http://cuelgame.net/search.php?q=%s" % (texto)
-
-    try:
-        return scraper(item)
-    # Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def scraper(item):
-    logger.info()
-    itemlist = []
-    # Descarga la página
-    data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}| |CET", "", data)
-    patron  = '<h2> <a href="([^"]+)".*?'
-    patron += 'class="l:\d+".*?>([^<]+)</a>'
-    patron += '(.*?)class="lazy".*?'
-    patron += 'news-content">([^<]+)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, check_thumb, scrapedplot in matches:
-        scrapedtitle = re.sub(r'\.', ' ', scrapedtitle)
-        scrapedthumbnail = scrapertools.find_single_match(check_thumb, "</div><img src=\'([^\']+)\'")
-        title_year = re.sub(r"(\d+)p", "", scrapedtitle)
-        if "category=4" in item.url:
-            try:
-                year = scrapertools.find_single_match(title_year, '.*?(\d\d\d\d)')
-            except:
-                year = ""
-        else:
-            year = ""
-        # No deja pasar items de la mula
-        if scrapedurl.startswith("ed2k:"):
-            continue
-        scrapedtitle = "[COLOR greenyellow]" + scrapedtitle + "[/COLOR]"
-        itemlist.append(
-            Item(channel=item.channel, title=scrapedtitle, url=scrapedurl, action="play", server="torrent",
-                 thumbnail=scrapedthumbnail, folder=False))
-    # Extrae el paginador
-    patronvideos = '<a href="([^"]+)" rel="next">siguiente &#187;</a>'
-    matches = scrapertools.find_multiple_matches(data, patronvideos)
-    if len(matches) > 0:
-        # corrige "&" para la paginación
-        next_page = matches[0].replace("amp;", "")
-        scrapedurl = urlparse.urljoin(item.url, next_page)
-        itemlist.append(Item(channel=item.channel, action="scraper", title="Página siguiente >>", url=scrapedurl,
-                             thumbnail="http://imgur.com/ycPgVVO.png", folder=True))
-    return itemlist
-
-
-def newest(categoria):
-    logger.info()
-    itemlist = []
-    item = Item()
-    try:
-        if categoria == 'torrent':
-            item.url = 'http://cuelgame.net/?category=4'
-        itemlist = scraper(item)
-        if itemlist[-1].action == "Página siguiente >>":
-            itemlist.pop()
-    # Se captura la excepción, para no interrumpir al canal novedades si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("{0}".format(line))
-        return []
-    return itemlist
diff --git a/plugin.video.alfa/channels/plusdede.json b/plugin.video.alfa/channels/plusdede.json
index 9a305d15..88418235 100755
--- a/plugin.video.alfa/channels/plusdede.json
+++ b/plugin.video.alfa/channels/plusdede.json
@@ -1,7 +1,7 @@
 {
   "id": "plusdede",
   "name": "Plusdede",
-  "active": true,
+  "active": false,
   "adult": false,
   "language": ["cast"],
   "thumbnail": "https://s18.postimg.cc/e17e98eqh/6_-_4_Isbv_Q3.png",
diff --git a/plugin.video.alfa/channels/seriecanal.py b/plugin.video.alfa/channels/seriecanal.py
deleted file mode 100644
index 843966c8..00000000
--- a/plugin.video.alfa/channels/seriecanal.py
+++ /dev/null
@@ -1,226 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urllib
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core import tmdb
-from platformcode import config, logger
-
-__modo_grafico__ = config.get_setting('modo_grafico', "seriecanal")
-__perfil__ = config.get_setting('perfil', "seriecanal")
-
-# Fijar perfil de color            
-perfil = [['0xFFFFE6CC', '0xFFFFCE9C', '0xFF994D00'],
-          ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E'],
-          ['0xFF58D3F7', '0xFF2E9AFE', '0xFF2E64FE']]
-color1, color2, color3 = perfil[__perfil__]
-
-host = "https://www.seriecanal.com/"
-
-
-def login():
-    logger.info()
-    data = httptools.downloadpage(host).data
-    if "Cerrar Sesion" in data:
-        return True, ""
-    usuario = config.get_setting("user", "seriecanal")
-    password = config.get_setting("password", "seriecanal")
-    if usuario == "" or password == "":
-        return False, 'Regístrate en www.seriecanal.com e introduce tus datos en "Configurar Canal"'
-    else:
-        post = urllib.urlencode({'username': usuario, 'password': password})
-        data = httptools.downloadpage(host + "index.php?page=member&do=login&tarea=acceder", post=post).data
-        if "Bienvenid@, se ha identificado correctamente en nuestro sistema" in data:
-            return True, ""
-        else:
-            return False, "Error en el login. El usuario y/o la contraseña no son correctos"
-
-
-def mainlist(item):
-    logger.info()
-    itemlist = []
-    item.text_color = color1
-    result, message = login()
-    if result:
-        itemlist.append(item.clone(action="series", title="Últimos episodios", url=host))
-        itemlist.append(item.clone(action="genero", title="Series por género"))
-        itemlist.append(item.clone(action="alfabetico", title="Series por orden alfabético"))
-        itemlist.append(item.clone(action="search", title="Buscar..."))
-    else:
-        itemlist.append(item.clone(action="", title=message, text_color="red"))
-    itemlist.append(item.clone(action="configuracion", title="Configurar canal...", text_color="gold", folder=False))
-    return itemlist
-
-
-def configuracion(item):
-    from platformcode import platformtools
-    ret = platformtools.show_channel_settings()
-    platformtools.itemlist_refresh()
-    return ret
-
-
-def search(item, texto):
-    logger.info()
-    item.url = host + "index.php?page=portada&do=category&method=post&category_id=0&order=" \
-               "C_Create&view=thumb&pgs=1&p2=1"
-    try:
-        post = "keyserie=" + texto
-        item.extra = post
-        return series(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def genero(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(host).data
-    data = scrapertools.find_single_match(data, '<ul class="tag-cloud">(.*?)</ul>')
-    matches = scrapertools.find_multiple_matches(data, '<a.*?href="([^"]+)">([^"]+)</a>')
-    for scrapedurl, scrapedtitle in matches:
-        scrapedtitle = scrapedtitle.capitalize()
-        url = urlparse.urljoin(host, scrapedurl)
-        itemlist.append(item.clone(action="series", title=scrapedtitle, url=url))
-    return itemlist
-
-
-def alfabetico(item):
-    logger.info()
-    itemlist = []
-    data = httptools.downloadpage(host).data
-    data = scrapertools.find_single_match(data, '<ul class="pagination pagination-sm" style="margin:5px 0;">(.*?)</ul>')
-    matches = scrapertools.find_multiple_matches(data, '<a.*?href="([^"]+)">([^"]+)</a>')
-    for scrapedurl, scrapedtitle in matches:
-        url = urlparse.urljoin(host, scrapedurl)
-        itemlist.append(item.clone(action="series", title=scrapedtitle, url=url))
-    return itemlist
-
-
-def series(item):
-    logger.info()
-    itemlist = []
-    item.infoLabels = {}
-    item.text_color = color2
-    if item.extra != "":
-        data = httptools.downloadpage(item.url, post=item.extra).data
-    else:
-        data = httptools.downloadpage(item.url).data
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
-
-    patron = '<div class="item-inner" style="margin: 0 20px 0px 0\;"><img src="([^"]+)".*?' \
-             'href="([^"]+)" title="Click para Acceder a la Ficha(?:\|([^"]+)|)".*?' \
-             '<strong>([^"]+)</strong></a>.*?<strong>([^"]+)</strong></p>.*?' \
-             '<p class="text-warning".*?\;">(.*?)</p>'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedthumbnail, scrapedurl, scrapedplot, scrapedtitle, scrapedtemp, scrapedepi in matches:
-        title = scrapedtitle + " - " + scrapedtemp + " - " + scrapedepi
-        url = urlparse.urljoin(host, scrapedurl)
-        temporada = scrapertools.find_single_match(scrapedtemp, "\d+")
-        episode = scrapertools.find_single_match(scrapedepi, "\d+")
-        #item.contentType = "tvshow"
-        if temporada != "":
-            item.infoLabels['season'] = temporada
-            #item.contentType = "season"
-        if episode != "":
-            item.infoLabels['episode'] = episode
-            #item.contentType = "episode"
-        itemlist.append(item.clone(action="findvideos", title=title, url=url,
-                                       contentSerieName=scrapedtitle,
-                                       context=["buscar_trailer"]))
-    tmdb.set_infoLabels(itemlist)
-    # Extra marca siguiente página
-    next_page = scrapertools.find_single_match(data, '<a href="([^"]+)" (?:onclick="return false;" |)title='
-                                                     '"Página Siguiente"')
-    if next_page != "/":
-        url = urlparse.urljoin(host, next_page)
-        itemlist.append(item.clone(action="series", title=">> Siguiente", url=url, text_color=color3))
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-    item.text_color = color3
-    data = httptools.downloadpage(item.url).data
-    data = scrapertools.decodeHtmlentities(data)
-    # Busca en la seccion descarga/torrent
-    data_download = scrapertools.find_single_match(data, '<th>Episodio - Enlaces de Descarga</th>(.*?)</table>')
-    patron = '<p class="item_name".*?<a href="([^"]+)".*?>([^"]+)</a>'
-    matches = scrapertools.find_multiple_matches(data_download, patron)
-    for scrapedurl, scrapedepi in matches:
-        new_item = item.clone()
-        if "Episodio" not in scrapedepi:
-            scrapedtitle = "[Torrent] Episodio " + scrapedepi
-        else:
-            scrapedtitle = "[Torrent] " + scrapedepi
-        scrapedtitle = scrapertools.htmlclean(scrapedtitle)
-        new_item.infoLabels['episode'] = scrapertools.find_single_match(scrapedtitle, "Episodio (\d+)")
-        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "]")
-        itemlist.append(new_item.clone(action="play", title=scrapedtitle, url=scrapedurl, server="torrent",
-                                       contentType="episode"))
-    # Busca en la seccion online
-    data_online = scrapertools.find_single_match(data, "<th>Enlaces de Visionado Online</th>(.*?)</table>")
-    patron = '<a href="([^"]+)\\n.*?src="([^"]+)".*?' \
-             'title="Enlace de Visionado Online">([^"]+)</a>'
-    matches = scrapertools.find_multiple_matches(data_online, patron)
-    for scrapedurl, scrapedthumb, scrapedtitle in matches:
-        # Deshecha enlaces de trailers
-        scrapedtitle = scrapertools.htmlclean(scrapedtitle)
-        if (scrapedthumb != "images/series/youtube.png") & (scrapedtitle != "Trailer"):
-            new_item = item.clone()
-            server = scrapertools.find_single_match(scrapedthumb, "images/series/(.*?).png")
-            title = "[" + server.capitalize() + "]" + " " + scrapedtitle
-
-            new_item.infoLabels['episode'] = scrapertools.find_single_match(scrapedtitle, "Episodio (\d+)")
-            itemlist.append(new_item.clone(action="play", title=title, url=scrapedurl, contentType="episode"))
-    # Comprueba si hay otras temporadas
-    if not "No hay disponible ninguna Temporada adicional" in data:
-        data_temp = scrapertools.find_single_match(data, '<div class="panel panel-success">(.*?)</table>')
-        data_temp = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data_temp)
-        patron = '<tr><td><p class="item_name"><a href="([^"]+)".*?' \
-                 '<p class="text-success"><strong>([^"]+)</strong>'
-        matches = scrapertools.find_multiple_matches(data_temp, patron)
-        for scrapedurl, scrapedtitle in matches:
-            new_item = item.clone()
-            url = urlparse.urljoin(host, scrapedurl)
-            scrapedtitle = scrapedtitle.capitalize()
-            temporada = scrapertools.find_single_match(scrapedtitle, "Temporada (\d+)")
-            if temporada != "":
-                new_item.infoLabels['season'] = temporada
-                new_item.infoLabels['episode'] = ""
-            itemlist.append(new_item.clone(action="findvideos", title=scrapedtitle, url=url, text_color="red",
-                                           contentType="season"))
-    tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__)
-    new_item = item.clone()
-    if config.is_xbmc():
-        new_item.contextual = True
-    itemlist.append(new_item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="",
-                                   text_color="magenta"))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-    if item.extra == "torrent":
-        itemlist.append(item.clone())
-    else:
-        # Extrae url de enlace bit.ly
-        if item.url.startswith("http://bit.ly/"):
-            item.url = scrapertools.getLocationHeaderFromResponse(item.url)
-        video_list = servertools.findvideos(item.url)
-        if video_list:
-            url = video_list[0][1]
-            server = video_list[0][2]
-        itemlist.append(item.clone(server=server, url=url))
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/seriesyonkis.json b/plugin.video.alfa/channels/seriesyonkis.json
deleted file mode 100755
index c1f15fd5..00000000
--- a/plugin.video.alfa/channels/seriesyonkis.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "id": "seriesyonkis",
-  "name": "Seriesyonkis",
-  "active": false,
-  "adult": false,
-  "language": ["cast"],
-  "thumbnail": "seriesyonkis.png",
-  "banner": "seriesyonkis.png",
-  "fanart": "seriesyonkis.jpg",
-  "categories": [
-    "tvshow",
-    "anime",
-    "vos"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": false,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/seriesyonkis.py b/plugin.video.alfa/channels/seriesyonkis.py
deleted file mode 100755
index c9b7c9e4..00000000
--- a/plugin.video.alfa/channels/seriesyonkis.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import httptools
-from core import scrapertools
-from core import servertools
-from core.item import Item
-from platformcode import config, logger
-
-host = 'https://yonkis.to'
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = list()
-    itemlist.append(Item(channel=item.channel, action="alfabetico", title="Listado alfabetico", url=host))
-    itemlist.append(Item(channel=item.channel, action="mas_vistas", title="Series más vistas",
-                         url=host + "/series-mas-vistas"))
-    itemlist.append(Item(channel=item.channel, action="ultimos", title="Últimos episodios añadidos",
-                         url=host))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url=host + "/buscar/serie"))
-
-    return itemlist
-
-
-def alfabetico(item):
-    logger.info()
-
-    itemlist = list()
-
-    itemlist.append(Item(channel=item.channel, action="series", title="0-9", url=host + "/lista-de-series/0-9"))
-    for letra in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ':
-        itemlist.append(Item(channel=item.channel, action="series", title=letra, url=host+"/lista-de-series/"+letra))
-
-    return itemlist
-
-
-def mas_vistas(item):
-    logger.info()
-
-    data = httptools.downloadpage(item.url).data
-    matches = re.compile('<a title="([^"]+)" href="([^"]+)".*?src="([^"]+)".*?</a>', re.S).findall(data)
-
-    itemlist = []
-    for scrapedtitle, scrapedurl, scrapedthumbnail in matches:
-        scrapedurl = urlparse.urljoin(item.url, scrapedurl)
-        scrapedthumbnail = urlparse.urljoin(item.url, scrapedthumbnail.replace("/90/", "/150/"))
-
-        itemlist.append(
-            Item(channel=item.channel, action="episodios", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl,
-                 thumbnail=scrapedthumbnail, show=scrapedtitle, fanart=item.fanart))
-
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-
-    itemlist = []
-    post = "keyword=%s&search_type=serie" % texto
-    data = httptools.downloadpage(item.url, post=post).data
-
-    try:
-        patron = '<a href="([^"]+)" title="([^"]+)"><img.*?src="([^"]+)".*?class="content">([^<]+)</div>'
-        matches = re.compile(patron, re.DOTALL).findall(data)
-        for scrapedurl, scrapedtitle, scrapedthumb, scrapedplot in matches:
-            title = scrapedtitle.strip()
-            url = host + scrapedurl
-            thumb = host + scrapedthumb.replace("/90/", "/150/")
-            plot = re.sub(r"\n|\r|\t|\s{2,}", "", scrapedplot.strip())
-            logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumb + "]")
-
-            itemlist.append(Item(channel=item.channel, action="episodios", title=title, fulltitle=title, url=url,
-                                 thumbnail=thumb, plot=plot, show=title))
-
-        return itemlist
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def ultimos(item):
-    logger.info()
-
-    itemlist = []
-
-    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
-    logger.debug("data %s" % data)
-    matches = re.compile('data-href="([^"]+)" data-src="([^"]+)" data-alt="([^"]+)".*?<a[^>]+>(.*?)</a>', re.S).findall(data)
-
-    for url, thumb, show, title in matches:
-
-        url = host + url
-
-        itemlist.append(Item(channel=item.channel, title=title, url=url, thumbnail=thumb, show=show.strip(),
-                             action="findvideos", fulltitle=title))
-
-    return itemlist
-
-
-def series(item):
-    logger.info()
-    itemlist = []
-
-    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
-
-    matches = scrapertools.find_single_match(data, '<ul id="list-container" class="dictionary-list">(.*?)</ul>')
-    matches = re.compile('title="([^"]+)" href="([^"]+)"', re.S).findall(matches)
-    for title, url in matches:
-        itemlist.append(Item(channel=item.channel, action="episodios", title=title, fulltitle=title,
-                             url=urlparse.urljoin(item.url, url), thumbnail=item.thumbnail, show=title))
-
-    # Paginador
-    matches = re.compile('<a href="([^"]+)">></a>', re.S).findall(data)
-
-    paginador = None
-    if len(matches) > 0:
-        paginador = Item(channel=item.channel, action="series", title="!Página siguiente",
-                         url=urlparse.urljoin(item.url, matches[0]), thumbnail=item.thumbnail, show=item.show)
-
-    if paginador and len(itemlist) > 0:
-        itemlist.insert(0, paginador)
-        itemlist.append(paginador)
-
-    return itemlist
-
-
-def episodios(item):
-    logger.info()
-
-    itemlist = []
-
-    # Descarga la pagina
-    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
-
-    pattern = '<meta property="og:description" content="([^/]+)" /><meta property="og:image" content="([^"]+)"'
-    plot, thumb = scrapertools.find_single_match(data, pattern)
-
-    matches = re.compile('<a class="episodeLink p1" href="([^"]+)"><strong>(.*?)</strong>(.*?)</a>', re.S).findall(data)
-
-    for url, s_e, title in matches:
-        url = host + url
-        title = s_e.strip() + title
-        itemlist.append(Item(channel=item.channel, title=title, url=url, thumbnail=thumb, show=item.show, plot=plot,
-                             action="findvideos", fulltitle=title))
-
-    if config.get_videolibrary_support():
-        itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url,
-                             action="add_serie_to_library", extra="episodios", show=item.show))
-        itemlist.append(Item(channel=item.channel, title="Descargar todos los episodios de la serie", url=item.url,
-                             action="download_all_episodes", extra="episodios", show=item.show))
-
-    return itemlist
-
-
-def findvideos(item):
-    logger.info()
-    itemlist = []
-
-    # Descarga la pagina
-    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
-
-    pattern = '<a href="([^"]+)"[^>]+><img[^>]+alt="([^"]+)" /></a></td><td class="episode-lang"><span ' \
-              'class="flags[^"]+" title="([^"]+)"'
-
-    matches = re.compile(pattern, re.S).findall(data)
-
-    for url, server, language in matches:
-        title = "[%s] - [%s]" % (language, server)
-        url = host + url
-        server = re.sub('(\..*)', '', server)
-        logger.debug("url %s" % url)
-        itemlist.append(Item(channel=item.channel, action="play", title=title, fulltitle=item.fulltitle, url=url,
-                        thumbnail=item.thumbnail, language=language, server=server))
-
-    return itemlist
-
-
-def play(item):
-    logger.info()
-
-    data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url).data)
-
-    itemlist = servertools.find_video_items(data=data)
-
-    for video_item in itemlist:
-        video_item.title = "%s [%s]" % (item.fulltitle, item.lang)
-        video_item.thumbnail = item.thumbnail
-        video_item.language = item.language
-
-    return itemlist
diff --git a/plugin.video.alfa/channels/tupornotv.json b/plugin.video.alfa/channels/tupornotv.json
deleted file mode 100755
index d4fe5877..00000000
--- a/plugin.video.alfa/channels/tupornotv.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "id": "tupornotv",
-  "name": "tuporno.tv",
-  "active": true,
-  "adult": true,
-  "language": ["*"],
-  "banner": "tupornotv.png",
-  "thumbnail": "tupornotv.png",
-  "categories": [
-    "adult"
-  ],
-  "settings": [
-    {
-      "id": "include_in_global_search",
-      "type": "bool",
-      "label": "Incluir en busqueda global",
-      "default": true,
-      "enabled": true,
-      "visible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/tupornotv.py b/plugin.video.alfa/channels/tupornotv.py
deleted file mode 100755
index bd7edca4..00000000
--- a/plugin.video.alfa/channels/tupornotv.py
+++ /dev/null
@@ -1,264 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import urlparse
-
-from core import scrapertools
-from core.item import Item
-from platformcode import logger
-
-
-def mainlist(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Pendientes de Votación", action="novedades",
-                         url="http://tuporno.tv/pendientes"))
-    itemlist.append(
-        Item(channel=item.channel, title="Populares", action="masVistos", url="http://tuporno.tv/", folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Categorias", action="categorias", url="http://tuporno.tv/categorias/",
-             folder=True))
-    itemlist.append(Item(channel=item.channel, title="Videos Recientes", action="novedades",
-                         url="http://tuporno.tv/videosRecientes/", folder=True))
-    itemlist.append(Item(channel=item.channel, title="Top Videos (mas votados)", action="masVotados",
-                         url="http://tuporno.tv/topVideos/", folder=True))
-    itemlist.append(Item(channel=item.channel, title="Nube de Tags", action="categorias", url="http://tuporno.tv/tags/",
-                         folder=True))
-    itemlist.append(Item(channel=item.channel, title="Buscar", action="search"))
-
-    return itemlist
-
-
-def novedades(item):
-    logger.info()
-    url = item.url
-    # ------------------------------------------------------
-    # Descarga la página
-    # ------------------------------------------------------
-    data = scrapertools.cachePage(url)
-    # logger.info(data)
-
-    # ------------------------------------------------------
-    # Extrae las entradas
-    # ------------------------------------------------------
-    # seccion novedades
-    '''
-    <table border="0" cellpadding="0" cellspacing="0" ><tr><td align="center" width="100%" valign="top" height="160px">
-    <a href="/videos/cogiendo-en-el-bosque"><img src="imagenes/videos//c/o/cogiendo-en-el-bosque_imagen2.jpg" alt="Cogiendo en el bosque" border="0" align="top" /></a>
-    <h2><a href="/videos/cogiendo-en-el-bosque">Cogiendo en el bosque</a></h2>
-    '''
-    patronvideos = '<div class="relative">(.*?)</div><div class="video'
-
-    matches = re.compile(patronvideos, re.DOTALL).findall(data)
-    # if DEBUG: scrapertools.printMatches(matches)
-
-    itemlist = []
-    for match in matches:
-        # Titulo
-        try:
-            scrapedtitle = re.compile('title="(.+?)"').findall(match)[0]
-
-        except:
-            scrapedtitle = ''
-        try:
-            scrapedurl = re.compile('href="(.+?)"').findall(match)[0]
-            scrapedurl = urlparse.urljoin(url, scrapedurl)
-        except:
-            continue
-        try:
-            scrapedthumbnail = re.compile('src="(.+?)"').findall(match)[0]
-            scrapedthumbnail = urlparse.urljoin(url, scrapedthumbnail)
-        except:
-            scrapedthumbnail = ''
-        scrapedplot = ""
-        try:
-            duracion = re.compile('<div class="duracion">(.+?)<').findall(match)[0]
-        except:
-            try:
-                duracion = re.compile('\((.+?)\)<br').findall(match[3])[0]
-            except:
-                duracion = ""
-
-        # logger.info("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"], duracion=["+duracion+"]")
-        # Añade al listado de XBMC
-        # trozos = scrapedurl.split("/")
-        # id = trozos[len(trozos)-1]
-        # videos = "http://149.12.64.129/videoscodiH264/"+id[0:1]+"/"+id[1:2]+"/"+id+".flv"
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=scrapedtitle + " [" + duracion + "]", url=scrapedurl,
-                 thumbnail=scrapedthumbnail, plot=scrapedplot, server="Directo", folder=False))
-
-    # ------------------------------------------------------
-    # Extrae el paginador
-    # ------------------------------------------------------
-    # <a href="/topVideos/todas/mes/2/" class="enlace_si">Siguiente </a>
-    patronsiguiente = '<a href="(.+?)" class="enlace_si">Siguiente </a>'
-    siguiente = re.compile(patronsiguiente, re.DOTALL).findall(data)
-    if len(siguiente) > 0:
-        scrapedurl = urlparse.urljoin(url, siguiente[0])
-        itemlist.append(Item(channel=item.channel, action="novedades", title="!Next page", url=scrapedurl, folder=True))
-
-    return itemlist
-
-
-def masVistos(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(
-        Item(channel=item.channel, title="Hoy", action="novedades", url="http://tuporno.tv/hoy", folder=True))
-    itemlist.append(Item(channel=item.channel, title="Recientes", action="novedades", url="http://tuporno.tv/recientes",
-                         folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Semana", action="novedades", url="http://tuporno.tv/semana", folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Mes", action="novedades", url="http://tuporno.tv/mes", folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Año", action="novedades", url="http://tuporno.tv/ano", folder=True))
-    return itemlist
-
-
-def categorias(item):
-    logger.info()
-
-    url = item.url
-    # ------------------------------------------------------
-    # Descarga la página
-    # ------------------------------------------------------
-    data = scrapertools.cachePage(url)
-    # logger.info(data)
-    # ------------------------------------------------------
-    # Extrae las entradas
-    # ------------------------------------------------------
-    # seccion categorias
-    # Patron de las entradas
-    if url == "http://tuporno.tv/categorias/":
-        patronvideos = '<li><a href="([^"]+)"'  # URL
-        patronvideos += '>([^<]+)</a></li>'  # TITULO
-    else:
-        patronvideos = '<a href="(.tags[^"]+)"'  # URL
-        patronvideos += ' class="[^"]+">([^<]+)</a>'  # TITULO
-
-    matches = re.compile(patronvideos, re.DOTALL).findall(data)
-    # if DEBUG: scrapertools.printMatches(matches)
-
-    itemlist = []
-    for match in matches:
-        if match[1] in ["SexShop", "Videochat", "Videoclub"]:
-            continue
-        # Titulo
-        scrapedtitle = match[1]
-        scrapedurl = urlparse.urljoin(url, match[0])
-        scrapedthumbnail = ""
-        scrapedplot = ""
-        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
-
-        # Añade al listado de XBMC
-        itemlist.append(Item(channel=item.channel, action="novedades", title=scrapedtitle.capitalize(), url=scrapedurl,
-                             thumbnail=scrapedthumbnail, plot=scrapedplot, folder=True))
-    return itemlist
-
-
-def masVotados(item):
-    logger.info()
-
-    itemlist = []
-    itemlist.append(
-        Item(channel=item.channel, title="Hoy", action="novedades", url="http://tuporno.tv/topVideos/todas/hoy",
-             folder=True))
-    itemlist.append(Item(channel=item.channel, title="Recientes", action="novedades",
-                         url="http://tuporno.tv/topVideos/todas/recientes", folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Semana", action="novedades", url="http://tuporno.tv/topVideos/todas/semana",
-             folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Mes", action="novedades", url="http://tuporno.tv/topVideos/todas/mes",
-             folder=True))
-    itemlist.append(
-        Item(channel=item.channel, title="Año", action="novedades", url="http://tuporno.tv/topVideos/todas/ano",
-             folder=True))
-    return itemlist
-
-
-def search(item, texto):
-    logger.info()
-    if texto != "":
-        texto = texto.replace(" ", "+")
-    else:
-        texto = item.extra.replace(" ", "+")
-    item.url = "http://tuporno.tv/buscador/?str=" + texto
-    try:
-        return getsearch(item)
-    # Se captura la excepción, para no interrumpir al buscador global si un canal falla
-    except:
-        import sys
-        for line in sys.exc_info():
-            logger.error("%s" % line)
-        return []
-
-
-def getsearch(item):
-    logger.info()
-    data = scrapertools.cachePage(item.url)
-    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<Br>|<BR>|<br>|<br/>|<br />|-\s", "", data)
-    patronvideos = '<div class="relative"><a href="(.videos[^"]+)"[^>]+><img.+?src="([^"]+)" alt="(.+?)" .*?<div class="duracion">(.+?)</div></div></div>'
-    matches = re.compile(patronvideos, re.DOTALL).findall(data)
-
-    if len(matches) > 0:
-        itemlist = []
-        for match in matches:
-            # Titulo
-            scrapedtitle = match[2].replace("<b>", "")
-            scrapedtitle = scrapedtitle.replace("</b>", "")
-            scrapedurl = urlparse.urljoin("http://tuporno.tv/", match[0])
-            scrapedthumbnail = urlparse.urljoin("http://tuporno.tv/", match[1])
-            scrapedplot = ""
-            duracion = match[3]
-
-            itemlist.append(
-                Item(channel=item.channel, action="play", title=scrapedtitle + " [" + duracion + "]", url=scrapedurl,
-                     thumbnail=scrapedthumbnail, plot=scrapedplot, server="Directo", folder=False))
-
-        '''<a href="/buscador/?str=busqueda&desde=HV_PAGINA_SIGUIENTE" class="enlace_si">Siguiente </a>'''
-        patronsiguiente = '<a href="([^"]+)" class="enlace_si">Siguiente </a>'
-        siguiente = re.compile(patronsiguiente, re.DOTALL).findall(data)
-        if len(siguiente) > 0:
-            patronultima = '<!--HV_SIGUIENTE_ENLACE'
-            ultpagina = re.compile(patronultima, re.DOTALL).findall(data)
-            scrapertools.printMatches(siguiente)
-
-            if len(ultpagina) == 0:
-                scrapedurl = urlparse.urljoin(item.url, siguiente[0])
-                itemlist.append(
-                    Item(channel=item.channel, action="getsearch", title="!Next page", url=scrapedurl, folder=True))
-    return itemlist
-
-
-def play(item):
-    logger.info()
-    itemlist = []
-
-    # Lee la pagina del video
-    data = scrapertools.cachePage(item.url)
-    codVideo = scrapertools.get_match(data, 'body id="([^"]+)"')
-    logger.info("codVideo=" + codVideo)
-
-    # Lee la pagina con el codigo
-    # http://tuporno.tv/flvurl.php?codVideo=188098&v=MAC%2011,5,502,146
-    url = "http://tuporno.tv/flvurl.php?codVideo=" + codVideo + "&v=MAC%2011,5,502,146"
-    data = scrapertools.cachePage(url)
-    logger.info("data=" + data)
-    kpt = scrapertools.get_match(data, "kpt\=(.+?)\&")
-    logger.info("kpt=" + kpt)
-
-    # Decodifica
-    import base64
-    url = base64.decodestring(kpt)
-    logger.info("url=" + url)
-
-    itemlist.append(
-        Item(channel=item.channel, action="play", title=item.title, url=url, thumbnail=item.thumbnail, plot=item.plot,
-             server="Directo", folder=False))
-
-    return itemlist