diff --git a/adbyby/Makefile b/adbyby/Makefile
deleted file mode 100644
index 831dcb5b6..000000000
--- a/adbyby/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (C) 2015-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v3.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=adbyby
-PKG_VERSION:=2.7
-PKG_RELEASE:=20200315
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=Powerful adblock module to block ad.
-	DEPENDS:=@(i386||x86_64||arm||mipsel||mips||aarch64)
-	URL:=http://www.adbyby.com/
-endef
-
-define Package/$(PKG_NAME)/description
-Adbyby is a powerful adblock module to block ad,just like adblock.
-endef
-
-ifeq ($(ARCH),x86_64)
-	ADBYBY_DIR:=amd64
-endif
-ifeq ($(ARCH),mipsel)
-	ADBYBY_DIR:=mipsle
-endif
-ifeq ($(ARCH),mips)
-	ADBYBY_DIR:=mips
-endif
-ifeq ($(ARCH),i386)
-	ADBYBY_DIR:=x86
-endif
-ifeq ($(ARCH),arm)
-	ADBYBY_DIR:=armv7
-	ifeq ($(BOARD),bcm53xx)
-		ADBYBY_DIR:=arm
-  endif
-  ifeq ($(BOARD),kirkwood)
-		ADBYBY_DIR:=arm
-  endif
-endif
-ifeq ($(ARCH),aarch64)
-	ADBYBY_DIR:=armv7
-endif
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/share/adbyby
-	$(INSTALL_BIN) ./files/adbyby.sh $(1)/usr/share/adbyby/
-	$(INSTALL_CONF) ./files/adhook.ini $(1)/usr/share/adbyby/
-	$(INSTALL_CONF) ./files/user.action $(1)/usr/share/adbyby/
-
-	$(INSTALL_DIR) $(1)/usr/share/adbyby/data
-	$(INSTALL_DATA) ./files/data/* $(1)/usr/share/adbyby/data/
-
-	$(INSTALL_DIR) $(1)/usr/share/adbyby/doc
-	$(INSTALL_DATA) ./files/doc/* $(1)/usr/share/adbyby/doc/
-
-	$(INSTALL_BIN) ./files/$(ADBYBY_DIR)/adbyby $(1)/usr/share/adbyby/adbyby
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/adbyby/files/adbyby.sh b/adbyby/files/adbyby.sh
deleted file mode 100755
index 146a070d1..000000000
--- a/adbyby/files/adbyby.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-PROG_PATH=/usr/share/adbyby
-err=0
-until [ $err -ge 5 ]; do
-	if [ -n "$(pgrep $PROG_PATH/adbyby)" ]; then
-		iptables-save | grep ADBYBY >/dev/null || \
-		/etc/init.d/adbyby add_rule
-		sleep 10
-		err=0
-	else
-		$PROG_PATH/adbyby --no-daemon &>/dev/null &
-		sleep 1
-		err=$((err+1))
-	fi
-done
-/etc/init.d/adbyby del_rule
diff --git a/adbyby/files/adhook.ini b/adbyby/files/adhook.ini
deleted file mode 100644
index 6a7613ea8..000000000
--- a/adbyby/files/adhook.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[cfg]
-### 2.1 ###
-listen-address=0.0.0.0:8118
-buffer-limit=1024
-keep-alive-timeout=30
-socket-timeout=60
-### 2.5 ###
-max_client_connections=0
-### 2.6 ###
-stack_size=200
-auto_restart=0
-### 2.7 ###
-debug=0
-ipset=0
diff --git a/adbyby/files/amd64/adbyby b/adbyby/files/amd64/adbyby
deleted file mode 100755
index 76c8fa084..000000000
Binary files a/adbyby/files/amd64/adbyby and /dev/null differ
diff --git a/adbyby/files/arm/adbyby b/adbyby/files/arm/adbyby
deleted file mode 100755
index a7da1900d..000000000
Binary files a/adbyby/files/arm/adbyby and /dev/null differ
diff --git a/adbyby/files/armv7/adbyby b/adbyby/files/armv7/adbyby
deleted file mode 100755
index 98dbfbe54..000000000
Binary files a/adbyby/files/armv7/adbyby and /dev/null differ
diff --git a/adbyby/files/data/lazy.bin b/adbyby/files/data/lazy.bin
deleted file mode 100644
index 23e6a8d70..000000000
Binary files a/adbyby/files/data/lazy.bin and /dev/null differ
diff --git a/adbyby/files/data/lazy.txt b/adbyby/files/data/lazy.txt
deleted file mode 100644
index 5d383c711..000000000
--- a/adbyby/files/data/lazy.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-!  -----����ʱ��:  2018-10-08 23:07:52   by:xwhyc-----
-.php?ad=
-/99rejs/js
-/agetsou.js^
-/c@*!25.js|$script
-/cococ-66/$script
-/defaultts.tc.qq.com/*.ts?index=0&start=0&
-/defaultts.tc.qq.com/*.ts?index=0&start=0&end=*&ver=4
-/gg_js/
-/imgs.js?t=
-/js/adtop.js|
-/js/guanggao_gg.js?d=
-/js/sss/ad.js
-/static/js/aall.js
-/unionjs/$script
-/variety.tc.qq.com/*.mp4^*fmt=hd
-/variety.tc.qq.com/*.mp4^*fmt=shd
-/video.dispatch.tc.qq.com/*.mp4^*sdtfrom=
-/view/image/QT_HY.jpg?t=
-/view/js/slade.js|$script
-/vlive.qqvideo.tc.qq.com/*.mp4^*fmt=hd
-/vlive.qqvideo.tc.qq.com/*.mp4^*fmt=shd
-/vmind.qqvideo.tc.qq.com/*.mp4^*sdtfrom=
-/vmindhls.tc.qq.com/*ugc=0&ga=0&gv=0&start=
-/zzhzgg.js
\ No newline at end of file
diff --git a/adbyby/files/data/rules.txt b/adbyby/files/data/rules.txt
deleted file mode 100644
index 5c44b0e8c..000000000
--- a/adbyby/files/data/rules.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-!  ------------------------------ ADByby 自定义过滤语法简表---------------------------------
-!  --------------  规则基于abp规则，并进行了字符替换部分的扩展-----------------------------
-!  ABP规则请参考https://adblockplus.org/zh_CN/filters，下面为大致摘要
-!  "!" 为行注释符，注释行以该符号起始作为一行注释语义，用于规则描述
-!  "*" 为字符通配符，能够匹配0长度或任意长度的字符串，该通配符不能与正则语法混用。
-!  "^" 为分隔符，可以是除了字母、数字或者 _ - . % 之外的任何字符。
-!  "|" 为管线符号，来表示地址的最前端或最末端
-!  "||" 为子域通配符，方便匹配主域名下的所有子域。
-!  "~" 为排除标识符，通配符能过滤大多数广告，但同时存在误杀, 可以通过排除标识符修正误杀链接。
-!  "##" 为元素选择器标识符，后面跟需要隐藏元素的CSS样式例如 #ad_id  .ad_class
-!!  元素隐藏暂不支持全局规则和排除规则
-!! 字符替换扩展
-!  文本替换选择器标识符，后面跟需要替换的文本数据，格式：$s@模式字符串@替换后的文本@
-!  支持通配符*和？
-!  -------------------------------------------------------------------------------------------
diff --git a/adbyby/files/data/user.txt b/adbyby/files/data/user.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/adbyby/files/data/video.txt b/adbyby/files/data/video.txt
deleted file mode 100644
index 3991c48fc..000000000
--- a/adbyby/files/data/video.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-!  -----����ʱ��:  2018-10-08 23:06:11   by:xwhyc-----------------------------------------------
-!  -----��淴��:http://www.adbyby.com/help.htm   QQȺ: 79547134(��), 364066294(��)��470705224(��)��534897434,438394572--------------
-
-
-!-------------------------------------------
-/showadv/
-3199.cn###ad640,[id^="ad0"]
-76fengyun.com###down_box{display:block!important;}.gggg,.ggao
-9553.com##[class="zm"]
-962.net##.show_ad,.g-962-ad
-amazon.cn##.adv-float-div
-downsx.rocks##.adbox,.Left-ad3_fixed,.google-ad2_fixed
-edu-acc.cn###doyoo_monitor
-fx678.com##[class^="adv-"]
-||76fengyun.com/body22233.js
-||76fengyun.com/file/$s@onclick="window.open('*');startWait();"@onclick="window.open(document.getElementById('downpage_link').href);startWait();"@
-||atanx.alicdn.com/t/tanxssp.js?_v=
-||biquguan.com/guan/$script
-||djv99sxoqpv11.cloudfront.net
-||jmxlaser.com
-||jump2.bdimg.com/p/$s@<div class="l_post l_post_bright j_l_post clearfix ?????????? "@<div style="display:none"@
-||nxkycx.com
-||res.jklan.cn/wp-content/themes/tt/js/system.js?ver=$s@function goto()@function xxx()@
-||tieba.com/p/$s@<div class="l_post l_post_bright j_l_post clearfix ?????????? "@<div style="display:none"@
-||ychap.com
-!-----------------------
-/qkostn.js|
-|http://mark.l.qq.com/fcgi-bin/get_video_mark_all*&strAdParam=
-!---------adbyby---------
-
diff --git a/adbyby/files/doc/hidecss.js b/adbyby/files/doc/hidecss.js
deleted file mode 100644
index 93c21f5fe..000000000
--- a/adbyby/files/doc/hidecss.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(global){var DOC=global.document,w3c_css=global.getComputedStyle,undef=void 0,reg_combinator=/^\s*([>+~,\s])\s*(\*|(?:[-\w*]|[^\x00-\xa0]|\\.)*)/,trimLeft=/^\s+/,trimRight=/\s+$/,reg_comma=/^\s*,\s*/,reg_sequence=/^([#\.:]|\[\s*)((?:[-\w]|[^\x00-\xa0]|\\.)+)/,reg_pseudo=/^\(\s*("([^"]*)"|'([^']*)'|[^\(\)]*(\([^\(\)]*\))?)\s*\)/,reg_attrib=/^\s*(?:(\S?=)\s*(?:(['"])(.*?)\2|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,reg_attrval=/\\([0-9a-fA-F]{2,2})/g,reg_sensitive=/^(?:title|id|name|class|for|href|src)$/,reg_backslash=/\\/g,reg_tag=/^((?:[-\w\*]|[^\x00-\xa0]|\\.)+)/,reg_parse_pseudo=/(-?)(\d*)n([-+]?\d*)/,reg_quick=/^(^|[#.])((?:[-\w]|[^\x00-\xa0]|\\.)+)$/,has_in=function(a,b){return(a in b)},dom={html:DOC.documentElement,mix:function(target,source){var args=[].slice.call(arguments),key,ride=typeof args[args.length-1]=="boolean"?args.pop():true;target=target||{};for(var i=1;source=args[i++];){for(key in source){if(ride||!has_in(key,target)){target[key]=source[key]}}}return target},rword:/[^, ]+/g,uuid:1,getUid:w3c_css?function(node){return node.uniqueNumber||(node.uniqueNumber=dom.uuid++)}:function(node){var uid=node.getAttribute("uniqueNumber");if(!uid){uid=dom.uuid++;node.setAttribute("uniqueNumber",uid)}return uid},oneObject:function(array,val){if(typeof array=="string"){array=array.match(dom.rword)||[]}var result={},value=val!==undef?val:1;for(var i=0,n=array.length;i<n;i++){result[array[i]]=value}return result}},hash_operator={"=":1,"!=":2,"|=":3,"~=":4,"^=":5,"$=":6,"*=":7},slice=Array.prototype.slice,attrURL=dom.oneObject("action,cite,codebase,data,href,longdesc,lowsrc,src,usemap",2),bools=dom["@bools"]="autofocus,autoplay,async,checked,controls,declare,disabled,defer,defaultchecked,contenteditable,ismap,loop,multiple,noshade,open,noresize,readonly,selected",boolOne=dom.oneObject(bools),fixGetAttribute,fixHasAttribute,fixById,fixByTag,filterPseudoHasExp=function(strchild,strsibling,type){return{exec:function(flags,lastResult,args){var result=[],flag_not=flags.not,child=strchild,sibling=strsibling,ofType=type,cache={},lock={},a=args.a,b=args.b,i=0,ri=0,el,found,diff,count;if(!ofType&&a===1&&b===0){return flag_not?[]:lastResult}for(var checkName=ofType?"nodeName":"nodeType",parent,pid,checkValue;el=lastResult[i++];){parent=el.parentNode;pid=dom.getUid(parent);if(!lock[pid]){count=lock[pid]=1;checkValue=ofType?el.nodeName:1;for(var node=parent[child];node;node=node[sibling]){if(node[checkName]===checkValue){pid=dom.getUid(node);cache[pid]=count++}}}diff=cache[dom.getUid(el)]-b;found=a===0?diff===0:(diff%a===0&&diff/a>=0);(found^flag_not)&&(result[ri++]=el)}return result}}},onePosition=dom.oneObject("eq,gt,lt,first,last,even,odd"),siblingCheck=function(a,b,ret){if(a===b){return ret}var cur=a.nextSibling;while(cur){if(cur===b){return -1}cur=cur.nextSibling}return 1},sortOrder1=function(a,b){if(a===b){sortOrder1.hasDuplicate=true;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition){return a.compareDocumentPosition?-1:1}return a.compareDocumentPosition(b)&4?-1:1},sortOrder2=function(a,b){if(a===b){sortOrder2.hasDuplicate=true;return 0}var al,bl,ap=[],bp=[],aup=a.parentNode,bup=b.parentNode,cur=aup;if(aup===bup){return siblingCheck(a,b)}else{if(!aup){return -1}else{if(!bup){return 1}}}while(cur){ap.unshift(cur);cur=cur.parentNode}cur=bup;while(cur){bp.unshift(cur);cur=cur.parentNode}al=ap.length;bl=bp.length;for(var i=0;i<al&&i<bl;i++){if(ap[i]!==bp[i]){return siblingCheck(ap[i],bp[i])}}return i===al?siblingCheck(a,bp[i],-1):siblingCheck(ap[i],b,1)},_toHex=function(x,y){return String.fromCharCode(parseInt(y,16))},parse_pseudo=function(key,match){var expr=match[3]||match[2];expr=expr?expr.replace(reg_attrval,_toHex):match[1];if(!key.indexOf("nth")){expr=expr.replace(/^\+|\s*/g,"");match=(expr==="even"&&"2n"||expr==="odd"&&"2n+1"||!/\D/.test(expr)&&"0n+"+expr||expr).match(reg_parse_pseudo);return{a:(match[1]+(match[2]||1))-0,b:match[3]-0}}return expr},makeArray=function(nodes,result,flag_multi){nodes=slice.call(nodes,0);if(result){result.push.apply(result,nodes)}else{result=nodes}return flag_multi?dom.unique(result):result},getElementsByTagName=function(tagName,els,flag_xml){var method="getElementsByTagName",elems=[],uniqResult={},prefix;if(flag_xml&&tagName.indexOf(":")>0&&els.length&&els[0].lookupNamespaceURI){var arr=tagName.split(":");prefix=arr[0];tagName=arr[1];method="getElementsByTagNameNS";prefix=els[0].lookupNamespaceURI(prefix)}switch(els.length){case 0:return elems;case 1:var all=prefix?els[0][method](prefix,tagName):els[0][method](tagName);for(var i=0,ri=0,el;el=all[i++];){if(el.nodeType===1){elems[ri++]=el}}return elems;default:for(var nodes,i=0,ri=0;el=els[i++];){nodes=prefix?el[method](prefix,tagName):el[method](tagName);for(var uid,j=0,node;node=nodes[j++];){uid=dom.getUid(node);if(!uniqResult[uid]){uniqResult[uid]=elems[ri++]=node}}}return elems}},getElementsByXPath=function(xpath,context,doc){var result=[];try{if(global.DOMParser){var nodes=doc.evaluate(xpath,context,null,7,null);for(var i=0,n=nodes.snapshotLength;i<n;i++){result[i]=nodes.snapshotItem(i)}}else{nodes=context.selectNodes(xpath);for(i=0,n=nodes.length;i<n;i++){result[i]=nodes[i]}}}catch(e){return false}return result};if(trimLeft.test("\xA0")){trimLeft=/^[\s\xA0]+/;trimRight=/[\s\xA0]+$/}global.onerror=function(){return !0};dom.mix(dom,{isXML:function(el){var doc=el.ownerDocument||el;return doc.createElement("p").nodeName!==doc.createElement("P").nodeName},contains:function(a,b){if(a.compareDocumentPosition){return !!(a.compareDocumentPosition(b)&16)}else{if(a.contains){return a!==b&&(a.contains?a.contains(b):true)}}while((b=b.parentNode)){if(a===b){return true}}return false},getText:function(nodes){var ret="",elem;for(var i=0;nodes[i];i++){elem=nodes[i];if(elem.nodeType===3||elem.nodeType===4){ret+=elem.nodeValue}else{if(elem.nodeType!==8){ret+=this.getText(elem.childNodes)}}}return ret},hasDuplicate:false,unique:function(nodes){if(nodes.length<2){return nodes}var result=[],array=[],uniqResult={},node=nodes[0],index,ri=0;if(node.sourceIndex){for(var i=0,n=nodes.length;i<n;i++){node=nodes[i];index=node.sourceIndex+100000000;if(!uniqResult[index]){(array[ri++]=new String(index))._=node;uniqResult[index]=1}}array.sort();while(ri){result[--ri]=array[ri]._}return result}else{var sortOrder=node.compareDocumentPosition?sortOrder1:sortOrder2;nodes.sort(sortOrder);if(sortOrder.hasDuplicate){for(i=1,len=nodes.length;i<len;i++){if(nodes[i]===nodes[i-1]){nodes.splice(i--,1)}}}sortOrder.hasDuplicate=false;return nodes}}});(function(){var select=DOC.createElement("select"),option=select.appendChild(DOC.createElement("option"));option.setAttribute("selected","selected");option.className="x";fixGetAttribute=option.getAttribute("class")!="x";select.appendChild(DOC.createComment(""));fixByTag=select.getElementsByTagName("*").length==2;var all=DOC.getElementsByTagName("*"),node,nodeType,comments=[],i=0,j=0;while((node=all[i++])){nodeType=node.nodeType;nodeType===1?dom.getUid(node):nodeType===8?comments.push(node):0}while((node=comments[j++])){node.parentNode.removeChild(node)}fixHasAttribute=select.hasAttribute?!option.hasAttribute("selected"):true;var form=DOC.createElement("div"),id="fixId"+(+new Date),root=dom.html;form.innerHTML="<a name='"+id+"'/>";root.insertBefore(form,root.firstChild);fixById=!!DOC.getElementById(id);root.removeChild(form)})();try{slice.call(dom.html.childNodes,0)[0].nodeType}catch(e){makeArray=function(nodes,result,flag_multi){var ret=result||[],ri=ret.length;for(var i=0,el;el=nodes[i++];){ret[ri++]=el}return flag_multi?dom.unique(ret):ret}}var Icarus=dom.query=function(expr,contexts,result,lastResult,flag_xml,flag_multi,flag_dirty){result=result||[];contexts=contexts||DOC;var pushResult=makeArray;if(!contexts.nodeType){contexts=pushResult(contexts);if(!contexts.length){return result}}else{contexts=[contexts]}var rrelative=reg_combinator,rBackslash=reg_backslash,rcomma=reg_comma,context=contexts[0],doc=context.ownerDocument||context,rtag=reg_tag,flag_all,uniqResult,elems,nodes,tagName,last,ri,uid;expr=expr.replace(trimLeft,"").replace(trimRight,"");flag_xml=flag_xml!==undef?flag_xml:dom.isXML(doc);if(flag_xml&&expr==="body"&&context.body){return pushResult([context.body],result,flag_multi)}if(!flag_xml&&doc.querySelectorAll){var query=expr,fix_icarus_sqa="fix_icarus_sqa";if(contexts.length>2||doc.documentMode==8&&context.nodeType==1){if(contexts.length>2){context=doc}query="."+fix_icarus_sqa+" "+query;for(var i=0,node;node=contexts[i++];){if(node.nodeType===1){node.className=fix_icarus_sqa+" "+node.className}}}if(doc.documentMode!==8||context.nodeName.toLowerCase()!=="object"){try{return pushResult(context.querySelectorAll(query),result,flag_multi)}catch(e){}finally{if(!query.indexOf("."+fix_icarus_sqa)){for(i=0;node=contexts[i++];){if(node.nodeType===1){node.className=node.className.replace(fix_icarus_sqa+" ","")}}}}}}var match=expr.match(reg_quick);if(match){var value=match[2].replace(rBackslash,""),key=match[1];if(key==""){nodes=getElementsByTagName(value,contexts,flag_xml)}else{if(key==="."&&contexts.length===1){if(flag_xml){nodes=getElementsByXPath("//*[@class='"+value+"']",context,doc)}else{if(context.getElementsByClassName){nodes=context.getElementsByClassName(value)}}}else{if(key==="#"&&contexts.length===1){if(flag_xml){nodes=getElementsByXPath("//*[@id='"+value+"']",context,doc)}else{if(context.nodeType==Math.pow(3,2)){node=doc.getElementById(value);nodes=!node?[]:!fixById?[node]:node.getAttributeNode("id").nodeValue===value?[node]:false}}}}}if(nodes){return pushResult(nodes,result,flag_multi)}}lastResult=contexts;if(lastResult.length){loop:while(expr&&last!==expr){flag_dirty=false;elems=null;uniqResult={};if((match=expr.match(rrelative))){expr=RegExp.rightContext;elems=[];tagName=(flag_xml?match[2]:match[2].toUpperCase()).replace(rBackslash,"")||"*";i=0;ri=0;flag_all=tagName==="*";switch(match[1]){case" ":if(expr.length||match[2]){elems=getElementsByTagName(tagName,lastResult,flag_xml)}else{elems=lastResult;break loop}break;case">":while((node=lastResult[i++])){for(node=node.firstChild;node;node=node.nextSibling){if(node.nodeType===1&&(flag_all||tagName===node.nodeName)){elems[ri++]=node}}}break;case"+":while((node=lastResult[i++])){while((node=node.nextSibling)){if(node.nodeType===1){if(flag_all||tagName===node.nodeName){elems[ri++]=node}break}}}break;case"~":while((node=lastResult[i++])){while((node=node.nextSibling)){if(node.nodeType===1&&(flag_all||tagName===node.nodeName)){uid=dom.getUid(node);if(uniqResult[uid]){break}else{uniqResult[uid]=elems[ri++]=node}}}}elems=dom.unique(elems);break}}else{if((match=expr.match(rtag))){expr=RegExp.rightContext;elems=getElementsByTagName(match[1].replace(rBackslash,""),lastResult,flag_xml)}}if(expr){var arr=Icarus.filter(expr,elems,lastResult,doc,flag_xml);expr=arr[0];elems=arr[1];if(!elems){flag_dirty=true;elems=getElementsByTagName("*",lastResult,flag_xml)}if((match=expr.match(rcomma))){expr=RegExp.rightContext;pushResult(elems,result);return Icarus(expr,contexts,result,[],flag_xml,true,flag_dirty)}else{lastResult=elems}}}}if(flag_multi){if(elems.length){return pushResult(elems,result,flag_multi)}}else{if(DOC!==doc||fixByTag&&flag_dirty){for(result=[],ri=0,i=0;node=elems[i++];){if(node.nodeType===1){result[ri++]=node}}return result}}return elems},filterPseudoNoExp=function(name,isLast,isOnly){var A="for(var result=[],flag_not=A.not,node,el,tagName,i=0,ri=0,found=0;node=el=B[i++];found=0){",B="{0}while(!found&&(node=node.{1})){(node.{2}==={3})&&++found}",C="node=el;while(!found&&(node=node.previousSibling)){node.{2}==={3}&&++found}",D="!found^flag_not&&(result[ri++]=el)}return result",start=isLast?"nextSibling":"previousSibling",fills={type:["tagName=el.nodeName;",start,"nodeName","tagName"],child:["",start,"nodeType","1"]}[name],body=A+B+(isOnly?C:"")+D;return{exec:new Function("A","B",body.replace(/{(\d)}/g,function($,$1){return fills[$1]}))}};dom.mix(Icarus,{getAttribute:!fixGetAttribute?function(elem,name){return elem.getAttribute(name)||""}:function(elem,name,flag_xml){if(flag_xml){return elem.getAttribute(name)||""}name=name.toLowerCase();if(attrURL[name]){return elem.getAttribute(name,2)||""}if(elem.tagName==="INPUT"&&name=="type"){return elem.getAttribute("type")||elem.type}var attr=boolOne[name]?(elem.getAttribute(name)?name:""):(elem=elem.getAttributeNode(name))&&elem.value||"";return reg_sensitive.test(name)?attr:attr.toLowerCase()},hasAttribute:!fixHasAttribute?function(elem,name,flag_xml){return flag_xml?!!elem.getAttribute(name):elem.hasAttribute(name)}:function(elem,name){elem=elem.getAttributeNode(name.toLowerCase());return !!(elem&&(elem.specified||elem.nodeValue))},filter:function(expr,elems,lastResult,doc,flag_xml,flag_get){var rsequence=reg_sequence,rattrib=reg_attrib,rpseudo=reg_pseudo,rBackslash=reg_backslash,rattrval=reg_attrval,pushResult=makeArray,toHex=_toHex,_hash_op=hash_operator,parsePseudo=parse_pseudo,match,key,tmp;while((match=expr.match(rsequence))){expr=RegExp.rightContext;key=(match[2]||"").replace(rBackslash,"");if(!elems){if(lastResult.length===1&&lastResult[0]===doc){switch(match[1]){case"#":if(!flag_xml){tmp=doc.getElementById(key);if(!tmp){elems=[];continue}if(fixById?tmp.id===key:tmp.getAttributeNode("id").nodeValue===key){elems=[tmp];continue}}break;case":":switch(key){case"root":elems=[doc.documentElement];continue;case"link":elems=pushResult(doc.links||[]);continue}break}}elems=getElementsByTagName("*",lastResult,flag_xml)}var filter=0,flag_not=false,args;switch(match[1]){case"#":filter=["id","=",key];break;case".":filter=["class","~=",key];break;case":":tmp=Icarus.hook[key];if((match=expr.match(rpseudo))){expr=RegExp.rightContext;args=parsePseudo(key,match)}if(tmp){filter=tmp}else{if(key==="not"){flag_not=true;if(args==="*"){elems=[]}else{if(reg_tag.test(args)){tmp=[];match=flag_xml?args:args.toUpperCase();for(var i=0,ri=0,elem;elem=elems[i++];){if(match!==elem.nodeName){tmp[ri++]=elem}}elems=tmp}else{var obj=Icarus.filter(args,elems,lastResult,doc,flag_xml,true);filter=obj.filter;args=obj.args}}}else{throw"!"}}break;default:filter=[key.toLowerCase()];if((match=expr.match(rattrib))){expr=RegExp.rightContext;if(match[1]){filter[1]=match[1];filter[2]=match[3]||match[4];filter[2]=filter[2]?filter[2].replace(rattrval,toHex).replace(rBackslash,""):""}}break}if(flag_get){return{filter:filter,args:args}}if(elems.length&&filter){tmp=[];i=0;ri=0;if(typeof filter==="function"){if(onePosition[key]){args=args===undef?elems.length-1:~~args;for(;elem=elems[i];){if(filter(i++,args)^flag_not){tmp[ri++]=elem}}}else{while((elem=elems[i++])){if((!!filter(elem,args))^flag_not){tmp[ri++]=elem}}}}else{if(typeof filter.exec==="function"){tmp=filter.exec({not:flag_not,xml:flag_xml},elems,args,doc)}else{var name=filter[0],op=_hash_op[filter[1]],val=filter[2]||"",flag,attr,className;if(!flag_xml&&name==="class"&&op===4){val=" "+val+" ";while((elem=elems[i++])){className=elem.className;if(!!(className&&~(" "+className+" ").indexOf(val))^flag_not){tmp[ri++]=elem}}}else{if(!flag_xml&&op&&val&&!reg_sensitive.test(name)){val=val.toLowerCase()}if(op===4){val=" "+val+" "}while((elem=elems[i++])){if(!op){flag=Icarus.hasAttribute(elem,name,flag_xml)}else{if(val===""&&op>3){flag=false}else{attr=Icarus.getAttribute(elem,name,flag_xml);switch(op){case 1:(flag=attr===val);break;case 2:(flag=attr!==val);break;case 3:(flag=attr===val||attr.substr(0,val.length+1)===val+"-");break;case 4:(flag=attr!==""&&!!~(" "+attr+" ").indexOf(val));break;case 5:(flag=attr!==""&&!attr.indexOf(val));break;case 6:(flag=attr!==""&&attr.substr(attr.length-val.length)===val);break;case 7:(flag=attr!==""&&!!~attr.indexOf(val));break}}}if(flag^flag_not){tmp[ri++]=elem}}}}}elems=tmp}}return[expr,elems]}});Icarus.hook={root:function(el){return el===(el.ownerDocument||el.document).documentElement},"first-child":filterPseudoNoExp("child",false,false),"last-child":filterPseudoNoExp("child",true,false),"only-child":filterPseudoNoExp("child",true,true),"nth-child":filterPseudoHasExp("firstChild","nextSibling",false),link:{exec:function(flags,elems){var links=(elems[0].ownerDocument||elems[0].document).links;if(!links){return[]}var result=[],checked={},flag_not=flags.not;for(var i=0,ri=0,elem;elem=links[i++];){checked[dom.getUid(elem)]=1}for(i=0;elem=elems[i++];){if(checked[dom.getUid(elem)]^flag_not){result[ri++]=elem}}return result}},lang:{exec:function(flags,elems,arg){var result=[],reg=new RegExp("^"+arg,"i"),flag_not=flags.not;for(var tmp,i=0,ri=0,elem;elem=elems[i++];){tmp=elem;while(tmp&&!tmp.getAttribute("lang")){tmp=tmp.parentNode}tmp=!!(tmp&&reg.test(tmp.getAttribute("lang")));if(tmp^flag_not){result[ri++]=elem}}return result}},contains:{exec:function(flags,elems,arg){var res=[],flag_not=flags.not;for(var i=0,ri=0,elem;elem=elems[i++];){if(!!~((elem.innerText||elem.textContent||dom.getText([elem])).indexOf(arg))^flag_not){res[ri++]=elem}}return res}},selected:function(el){el.parentNode&&el.parentNode.selectedIndex;return el.selected===true},header:function(el){return/h\d/i.test(el.nodeName)},button:function(el){return"button"===el.type||el.nodeName==="BUTTON"},input:function(el){return/input|select|textarea|button/i.test(el.nodeName)},parent:function(el){return !!el.firstChild},has:function(el,expr){return !!dom.query(expr,[el]).length},first:function(index){return index===0},last:function(index,num){return index===num},even:function(index){return index%2===0},odd:function(index){return index%2===1},lt:function(index,num){return index<num},gt:function(index,num){return index>num},eq:function(index,num){return index===num},hidden:function(el){return(el.offsetWidth+el.offsetHeight)==0||(el.currentStyle||{}).display=="none"}};Icarus.hook.visible=function(el){return !Icarus.hook.hidden(el)};"text,radio,checkbox,file,password,submit,image,reset".replace(dom.rword,function(name){Icarus.hook[name]=function(el){return(el.getAttribute("type")||el.type)===name}});var blockCss=/(?:function|open|document|location|alert|confirm|prompt|showmodelessdialog|activexobject|xmlhttprequest|execscript|eval)\s*[(.=;]/i,checkCss=function(a,b){b=b||"visibility";return"hidden"==(w3c_css?DOC.defaultView.getComputedStyle(a,null).getPropertyValue(b):a.currentStyle[b])},removeNode=!!global.VBArray?function(){var b;return function(a){if(a&&"BODY"!=a.tagName){b=b||DOC.createElement("DIV");b.appendChild(a);b.innerHTML=""}}}():function(a){a&&a.parentNode&&"BODY"!=a.tagName&&a.parentNode.removeChild(a)},execFunc=[function(){},function(a){for(var b,c=a.length;c--;){b=a[c];checkCss(b)||(b.style.display="none",b.style.visibility="hidden")}},function(a){for(var c=a.length;c--;){removeNode(a[c])}}],execMainFunc=function(a,b){var c;try{c=dom.query(a)}catch(e){return((c=null),0)}return("function"==typeof execFunc[b]&&execFunc[b](c),c.length)},const_DOMContentLoaded="DOMContentLoaded",const_complete="complete",domReadyList=[],domisReady=0,domReady=function(fn){domisReady?fn():domReadyList.unshift(fn)},domfireReady=function(){if(!domisReady){if(!DOC.body){return setTimeout(domfireReady,32)}domisReady=1;for(var len=domReadyList.length;len--;){domReadyList[len]()}}},createCss=(function(){var style,media,self={},reg_media=/screen|all/i,splitCss=/[\[+>~:].+?/,addCss="{display:none;position:absolute;top:-1000000px;visibility:hidden}",styles=DOC.getElementsByTagName("style"),len=styles.length,new_css=function(g){for(var r=[],z=[],o,y=g.split(","),E=y.length;E--;){o=y[E];o&&(splitCss.test(o)?r:z).push(o)}z.length&&r.push(z.join());return(r.join(addCss)||"iframe")+addCss};while(len--){style=styles[len];media=style.getAttribute("media");if(media===null||reg_media.test(media)){self.style=style;break}}if(!self.style){var head=DOC.head||DOC.getElementsByTagName("head")[0];style=DOC.createElement("style");head.insertBefore(style,head.firstChild);domReady(function(){DOC.body&&DOC.body.insertBefore(style,DOC.body.firstChild)})}return style.styleSheet?function(css){style.styleSheet.cssText+=new_css(css)}:!!global.Components?function(css){style.innerHTML+=new_css(css)}:function(css){style.appendChild(DOC.createTextNode(new_css(css)))}})();if(const_complete==DOC.readyState){domfireReady()}else{if(!DOC.attachEvent){DOC.addEventListener(const_DOMContentLoaded,function(){DOC.removeEventListener(const_DOMContentLoaded,arguments.callee,false);domfireReady()},false)}else{DOC.attachEvent("onreadystatechange",function(){const_complete==DOC.readyState&&(DOC.detachEvent("onreadystatechange",arguments.callee),domfireReady())});(function(){if(domisReady){return}try{var node=new Image();node.doScroll();node=null}catch(e){setTimeout(arguments.callee,64);return}domfireReady()})()}}var AdSafe_CheckRule={regIDS:null,regSub:null,format:function(){var str=arguments[0];var regM=/\{\s*(\d+)\s*\}/,arr,temp="",xb;while((arr=regM.exec(str))!=null){xb=parseInt(arr[1]);if(isNaN(xb)||typeof(arguments[xb+1])=="undefined"){throw"��ָ������:"+arr[0]}temp+=str.substr(0,arr.index)+arguments[xb+1];str=str.substr(arr.index+arr[0].length)}temp+=str;return temp},isNullOrEmpty:function(str){var t=str;if(str.constructor==Array){t=str[0]}if(t==null||t==""){return true}return false},trim:function(str,dir){var regTrim;if(dir=="left"){regTrim=/^\s*/g}else{if(dir=="right"){regTrim=/\s*$/g}else{regTrim=/(?:^\s*|\s*$)/g}}if(str.constructor==String){str=str.replace(regTrim,"")}else{if(str.constructor==Array){for(var i=0;i<str.length;i++){str[i]=str[i].replace(regTrim,"")}}}return str},ini:function(){var strSub=":(has|not)\\(",str_i1="(?:[a-zA-Z_][\\w-]*)";var str_zifu_1=this.format('(?:"{0}"|{1})','(?:(?:\\\\\\\\)*(\\\\[^\\\\])?|[^"\\\\])*',"[^\"'\\\\]+");var str_zifu_2=this.format("(?:'{0}'|{1})","(?:(?:\\\\\\\\)*(\\\\[^\\\\])?|[^'\\\\])*","[^\"'\\\\]+");var str_zifu=this.format("(?:{0}|{1})",str_zifu_1,str_zifu_2),htmltag="(?:a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdi|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)",str_iden="(?:(?:(?:\\b"+htmltag+")?[\\.#]"+str_i1+")+|\\b"+htmltag+"\\b|\\*)",str_attr=this.format("(?:\\[\\s*{0}\\s*(?:(?:\\*|\\^|\\$|\\!)?\\=\\s*(?:{1})\\s*)?\\])",str_i1,str_zifu),str_quick=this.format("(?:\\:(?:button|input|parent|has{1}|not{1}|first|first-child|only-child|last-child|last|even|odd|lt{0}|gt{0}|eq{0}|nth-child{0}|hidden))","\\(\\s*\\d+\\s*\\)","\\([^)]+\\)"),str_alone=this.format("(?:\\s*(?:[>+]\\s*)?(?:{0}|{1}|{2})+)+",str_iden,str_attr,str_quick),str_jquerys=this.format("^{0}\\s*(?:,\\s*{0}\\s*)*$",str_alone);this.regIDS=new RegExp(str_jquerys,"i");this.regSub=new RegExp(strSub,"i")},Checking:function(str){if(this.isNullOrEmpty(str)){return false}var result=this.AloneSub(str);if(!result){return false}if(this.isNullOrEmpty(str)){return true}if(!this.CheckRules(str)){return false}return true},CheckRules:function(str){var strArr=str[0].split(",");var lst=[];for(var t=0;t<strArr.length;t++){lst.push(this.trim(strArr[t]));if(this.regIDS.test(lst.join(","))){lst=[]}}if(lst.length>0){return false}else{return true}},GetPair:function(k){var t=[],result=[],c;t.push("0");for(var i=0;i<k.length;i++){c=k.charAt(i);if(c=="("){t.push("0")}if(c==")"){t.pop()}if(t.length==0){return result.join("")}result.push(c)}return null},AloneSub:function(str){var v,v1,temp,temp1,result,hasSub=false,m=this.regSub.exec(str[0]);if(m!=null){v=str[0].substr(m.index+m[0].length);v1=[this.GetPair(v)];if(this.isNullOrEmpty(v1)){return false}temp=[v1[0]];result=this.AloneSub(v1);if(!result){return false}else{temp1=this.trim(str[0].substr(0,m.index),"right");if(temp1.length>0){var rc=str[0].charAt(temp1.length-1);if(rc==">"||rc=="+"||rc==","){if(temp1.length-1>=0){temp1=temp1.substr(0,temp1.length-1)}hasSub=true}}if(hasSub){str[0]=temp1+" "+str[0].substr(m.index+m[0].length+temp[0].length+1)}else{str[0]=str[0].substr(0,m.index)+str[0].substr(m.index+m[0].length+temp[0].length+1)}str[0]=this.trim(str[0])}if(this.isNullOrEmpty(str)){return true}return this.AloneSub(str)}else{return this.CheckRules(str)}}};var isIni=false;var checkCSSRule=function(line){if(!isIni){AdSafe_CheckRule.ini();isIni=true}var i=line.indexOf("??1");if(i>=0){line=line.substr(0,i)}line=AdSafe_CheckRule.trim(line);if(line==""){return false}return AdSafe_CheckRule.Checking([line])};global.hidecss=function(c){if(c.indexOf("??1")>-1||c.indexOf("??")<0){try{if(!checkCSSRule(c)){return}}catch(e){}}if(!c||blockCss.test(c)){return}var d=String(c).split("??"),f=parseInt(d[1],10)||1,g=d[0],l=100;var setCookie=function(name,value,expires,path,domain,secure){var curCookie=name+"="+escape(value)+((expires)?"; expires="+expires.toGMTString():"")+((path)?"; path="+path:"")+((domain)?"; domain="+domain:"")+((secure)?"; secure":"");document.cookie=curCookie};var addCookieForHours=function(name,value,path,domain,hour,secure){var t;if(hour){t=new Date();hour=isNaN(parseFloat(hour))?1:hour;t.setTime(t.getTime()+hour*3600*1000)}setCookie(name,value,t,path,domain,secure)};var deleteCookie=function(name,path,domain){document.cookie=name+"="+((path)?"; path="+path:"")+((domain)?"; domain="+domain:"")+"; expires=Thu, 01-Jan-70 00:00:01 GMT"};var clearCookie=function(path,domain,arr){var keys=[],r,reg=/([^=; ]+)=([^;]+)/g,cook=document.cookie;while((r=reg.exec(cook))!=null){keys.push(r[1])}if(keys&&keys.length>0){var _f;if(typeof arr=="undefined"||!arr){arr=[]}if(typeof arr=="string"){arr=[arr]}for(var i=keys.length-1;i--;i>=0){_f=false;for(var k=0;k<arr.length;k++){if(keys[i]==arr[k]){_f=true;break}}if(_f){continue}deleteCookie(keys[i],path,domain)}}};var checkParm=function(parm){return/^(?:\s*(?:(?:"[^"+(),]*"|null|\d+)|\[(?:\s*(?:"[^"+(),]*"|null|\d+)\s*)(?:(?:,(?:\s*(?:"[^"+(),]*"|null|\d+)\s*))*)\])\s*)(?:(?:,(?:\s*(?:(?:"[^"+(),]*"|null|\d+)|\[(?:\s*(?:"[^"+(),]*"|null|\d+)\s*)(?:(?:,(?:\s*(?:"[^"+(),]*"|null|\d+)\s*))*)\])\s*))*)$/.test(parm)};var execYC=function(method,arg){eval("try{"+method+"("+arg+");}catch(e){};")};if(f==3){eval("try{"+g+"}catch(e){}");return}if(f==4){if(!checkParm(g)){return}execYC("addCookieForHours",g);return}if(f==5){if(!checkParm(g)){return}execYC("deleteCookie",g);return}if(f==6){if(!checkParm(g)){return}execYC("clearCookie",g);return}1===f&&createCss(g);(function(){var b="$"+g,a=execMainFunc(g,f);dom[b]&&clearTimeout(dom[b]);dom[b]=null;(a||l--<0)||(dom[b]=setTimeout(arguments.callee,64))})();domReady(function(){execMainFunc(g,f)})}})(self);
\ No newline at end of file
diff --git a/adbyby/files/mips/adbyby b/adbyby/files/mips/adbyby
deleted file mode 100755
index c805034d8..000000000
Binary files a/adbyby/files/mips/adbyby and /dev/null differ
diff --git a/adbyby/files/mipsle/adbyby b/adbyby/files/mipsle/adbyby
deleted file mode 100755
index d4ddaafa8..000000000
Binary files a/adbyby/files/mipsle/adbyby and /dev/null differ
diff --git a/adbyby/files/update.info b/adbyby/files/update.info
deleted file mode 100644
index c81cc9f92..000000000
--- a/adbyby/files/update.info
+++ /dev/null
@@ -1,10 +0,0 @@
-;���¹���url,dir,size,reverse,reverse
-http://update.adbyby.com/rule3/lazy.jpg	\data\lazy.txt	385337	4	0	
-http://update.adbyby.com/rule3/video.jpg	\data\video.txt	1028	4	0	
-http://update.adbyby.com/rule3/user.action	\user.action	512	5	0	
-http://update.adbyby.com/rule3/clean.ini	\data\clean.ini	2167	0	0	
-http://update.adbyby.com/rule3/adclear.ini	\data\adclear.ini	4901	0	0	
-https://github.com/gchangchen/suho/raw/master/adhook.dll	\adhook.dll	117248	0	0	2.4.3.2
-https://github.com/gchangchen/suho/raw/master/adhook64.dll	\adhook64.dll	142848	0	0	2.4.3.2
-https://github.com/gchangchen/suho/raw/master/adbyby.exe	\adbyby.exe	1004183	1	0	2.4.4.0
-
diff --git a/adbyby/files/user.action b/adbyby/files/user.action
deleted file mode 100644
index e69de29bb..000000000
diff --git a/adbyby/files/x86/adbyby b/adbyby/files/x86/adbyby
deleted file mode 100755
index e6956ba26..000000000
Binary files a/adbyby/files/x86/adbyby and /dev/null differ
diff --git a/luci-app-adbyby-plus/Makefile b/luci-app-adbyby-plus/Makefile
deleted file mode 100644
index f7f3628b6..000000000
--- a/luci-app-adbyby-plus/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2020 Openwrt.org
-#
-# This is free software, licensed under the Apache License, Version 2.0 .
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=LuCI support for Adbyby
-LUCI_DEPENDS:=+adbyby +uclient-fetch +ipset +dnsmasq-full
-LUCI_PKGARCH:=all
-PKG_NAME:=luci-app-adbyby-plus
-PKG_VERSION:=2.0
-PKG_RELEASE:=75
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-adbyby-plus/luasrc/controller/adbyby.lua b/luci-app-adbyby-plus/luasrc/controller/adbyby.lua
deleted file mode 100644
index 85adb1466..000000000
--- a/luci-app-adbyby-plus/luasrc/controller/adbyby.lua
+++ /dev/null
@@ -1,86 +0,0 @@
-
-module("luci.controller.adbyby", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/adbyby") then
-		return
-	end
-	
-	entry({"admin", "services", "adbyby"}, alias("admin", "services", "adbyby", "base"), _("ADBYBY Plus +"), 9).dependent = true
-	
-	entry({"admin", "services", "adbyby", "base"}, cbi("adbyby/base"), _("Base Setting"), 10).leaf = true
-	entry({"admin", "services", "adbyby", "advanced"}, cbi("adbyby/advanced"), _("Advance Setting"), 20).leaf = true
-	entry({"admin", "services", "adbyby", "help"}, form("adbyby/help"), _("Plus+ Domain List"), 30).leaf = true
-	entry({"admin", "services", "adbyby", "esc"}, form("adbyby/esc"), _("Bypass Domain List"), 40).leaf = true
-	entry({"admin", "services", "adbyby", "black"}, form("adbyby/black"), _("Block Domain List"), 50).leaf = true
-	entry({"admin", "services", "adbyby", "block"}, form("adbyby/block"), _("Block IP List"), 60).leaf = true
-	entry({"admin", "services", "adbyby", "user"}, form("adbyby/user"), _("User-defined Rule"), 70).leaf = true
-	
-	entry({"admin", "services", "adbyby", "refresh"}, call("refresh_data"))
-	entry({"admin", "services", "adbyby", "run"}, call("act_status")).leaf = true
-end
-
-function act_status()
-	local e = {}
-	e.running = luci.sys.call("pgrep adbyby >/dev/null") == 0
-	luci.http.prepare_content("application/json")
-	luci.http.write_json(e)
-end
-
-
-function refresh_data()
-	local set = luci.http.formvalue("set")
-	local icount = 0
-
-if set == "rule_data" then
-luci.sys.exec("/usr/share/adbyby/rule-update")
-  icount = luci.sys.exec("/usr/share/adbyby/rule-count '/tmp/rules/'")
-  
-  if tonumber(icount)>0 then
-    if nixio.fs.access("/usr/share/adbyby/rules/") then
-      oldcount = luci.sys.exec("/usr/share/adbyby/rule-count '/usr/share/adbyby/rules/'")
-    else
-      oldcount=0
-    end
-  else
-    retstring ="-1"
-  end
-  
-  if tonumber(icount) ~= tonumber(oldcount) then
-		luci.sys.exec("rm -f /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/* && cp -a /tmp/rules /usr/share/adbyby/")
-		luci.sys.exec("/etc/init.d/adbyby restart &")
-		retstring=tostring(math.ceil(tonumber(icount)))
-	else
-		retstring ="0"
-	end
-else
-refresh_cmd = "uclient-fetch -q --no-check-certificate -O - 'https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt' > /tmp/adnew.conf"
-sret = luci.sys.call(refresh_cmd .. " 2>/dev/null")
-if sret== 0 then
-	luci.sys.call("/usr/share/adbyby/ad-update")
-	icount = luci.sys.exec("cat /tmp/ad.conf | wc -l")
-	if tonumber(icount)>0 then
-	if nixio.fs.access("/usr/share/adbyby/dnsmasq.adblock") then
-		oldcount = luci.sys.exec("cat /usr/share/adbyby/dnsmasq.adblock | wc -l")
-	else
-		oldcount=0
-	end
-	if tonumber(icount) ~= tonumber(oldcount) then
-		luci.sys.exec("cp -f /tmp/ad.conf /usr/share/adbyby/dnsmasq.adblock")
-		luci.sys.exec("cp -f /tmp/ad.conf /tmp/etc/dnsmasq-adbyby.d/adblock")
-		luci.sys.exec("/etc/init.d/adbyby restart &")
-		retstring=tostring(math.ceil(tonumber(icount)))
-	else
-		retstring ="0"
-	end
-	else
-	retstring ="-1"
-	end
-	luci.sys.exec("rm -f /tmp/ad.conf")
-else
-	retstring ="-1"
-end
-end
-luci.http.prepare_content("application/json")
-luci.http.write_json({ ret=retstring ,retcount=icount})
-end
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua
deleted file mode 100644
index 1d9faa69a..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/advanced.lua
+++ /dev/null
@@ -1,57 +0,0 @@
-
-local SYS  = require "luci.sys"
-local ND = SYS.exec("cat /usr/share/adbyby/dnsmasq.adblock | wc -l")
-
-local ad_count=0
-if nixio.fs.access("/usr/share/adbyby/dnsmasq.adblock") then
-ad_count=tonumber(SYS.exec("cat /usr/share/adbyby/dnsmasq.adblock | wc -l"))
-end
-
-local rule_count=0
-if nixio.fs.access("/usr/share/adbyby/rules/") then
-rule_count=tonumber(SYS.exec("/usr/share/adbyby/rule-count '/usr/share/adbyby/rules/'"))
-end
-
-m = Map("adbyby")
-
-s = m:section(TypedSection, "adbyby")
-s.anonymous = true
-
-o = s:option(Flag, "block_ios")
-o.title = translate("Block Apple iOS OTA update")
-o.default = 0
-o.rmempty = false
-
-o = s:option(Flag, "block_cnshort")
-o.title = translate("Block CNshort APP and Website")
-o.default = 0
-o.rmempty = false
-
-o = s:option(Flag, "cron_mode")
-o.title = translate("Update the rule at 6 a.m. every morning and restart adbyby")
-o.default = 0
-o.rmempty = false
-
-o=s:option(DummyValue,"ad_data",translate("Adblock Plus Data"))
-o.rawhtml  = true
-o.template = "adbyby/refresh"
-o.value =ad_count .. " " .. translate("Records")
-
-o=s:option(DummyValue,"rule_data",translate("Subscribe 3rd Rules Data"))
-o.rawhtml  = true
-o.template = "adbyby/refresh"
-o.value =rule_count .. " " .. translate("Records")
-o.description = translate("AdGuardHome / Host / DNSMASQ rules auto-convert")
-
-o = s:option(Button,"delete",translate("Delete All Subscribe Rules"))
-o.inputstyle = "reset"
-o.write = function()
-  SYS.exec("rm -f /usr/share/adbyby/rules/data/* /usr/share/adbyby/rules/host/*")
-  SYS.exec("/etc/init.d/adbyby restart 2>&1 &")
-  luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adbyby", "advanced"))
-end
-
-o = s:option(DynamicList, "subscribe_url", translate("Anti-AD Rules Subscribe"))
-o.rmempty = true
-
-return m
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/base.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/base.lua
deleted file mode 100644
index b9872cb19..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/base.lua
+++ /dev/null
@@ -1,66 +0,0 @@
-local NXFS = require "nixio.fs"
-local SYS  = require "luci.sys"
-local HTTP = require "luci.http"
-local DISP = require "luci.dispatcher"
-
-local DL = SYS.exec("head -1 /tmp/adbyby/data/lazy.txt | awk -F' ' '{print $3,$4}'") or ""
-local DV = SYS.exec("head -1 /tmp/adbyby/data/video.txt | awk -F' ' '{print $3,$4}'") or ""
-local NR = SYS.exec("grep -v '^!' /usr/share/adbyby/data/rules.txt | wc -l")
-local NU = SYS.exec("cat /usr/share/adbyby/data/user.txt | wc -l")
-local UD = NXFS.readfile("/tmp/adbyby.updated") or "1970-01-01 00:00:00"
-
-m = Map("adbyby")
-m.title	= translate("Adbyby Plus + Settings")
-m.description = translate("Adbyby Plus + can filter all kinds of banners, popups, video ads, and prevent tracking, privacy theft and a variety of malicious websites<br /><font color=\"red\">Plus + version combination mode can operation with Adblock Plus Host,filtering ads without losing bandwidth</font>")
-
-m:section(SimpleSection).template  = "adbyby/adbyby_status"
-
-s = m:section(TypedSection, "adbyby")
-s.anonymous = true
-
-o = s:option(Flag, "enable", translate("Enable"))
-o.default = 0
-o.rmempty = false
-
-o = s:option(ListValue, "wan_mode", translate("Running Mode"))
-o:value("0", translate("Global Mode (The slowest and the best effects)"))
-o:value("1", translate("Plus + Mode (Filter domain name list and blacklist website.Recommended)"))
-o:value("2", translate("No filter Mode (Must set in Client Filter Mode Settings manually)"))
-o.default = 1
-o.rmempty = false
-
-o = s:option(Button, "restart", translate("Adbyby and Rule state"))
-o.inputtitle = translate("Update Adbyby Rules Manually")
-o.description = string.format("<strong>"..translate("Last Update Checked")..":</strong> %s<br /><strong>"..translate("Lazy Rule")..":</strong>%s <br /><strong>"..translate("Video Rule")..":</strong>%s", UD, DL, DV)
-o.inputstyle = "reload"
-o.write = function()
-	SYS.call("rm -rf /tmp/adbyby.updated /tmp/adbyby/admd5.json && /usr/share/adbyby/adbybyupdate.sh > /tmp/adupdate.log 2>&1 &")
-  SYS.call("sleep 5")
-	HTTP.redirect(DISP.build_url("admin", "services", "adbyby"))
-end
-
-t = m:section(TypedSection, "acl_rule", translate("<strong>Client Filter Mode Settings</strong>"))
-t.description = translate("Filter mode settings can be set to specific LAN clients ( <font color=blue> No filter , Global filter </font> ) . Does not need to be set by default.")
-t.template = "cbi/tblsection"
-t.sortable = true
-t.anonymous = true
-t.addremove = true
-
-e = t:option(Value, "ipaddr", translate("IP Address"))
-e.width = "40%"
-e.datatype = "ip4addr"
-e.placeholder = "0.0.0.0/0"
-luci.ip.neighbors({ family = 4 }, function(entry)
-	if entry.reachable then
-		e:value(entry.dest:string())
-	end
-end)
-
-e = t:option(ListValue, "filter_mode", translate("Filter Mode"))
-e.width = "40%"
-e.default = "disable"
-e.rmempty = false
-e:value("disable", translate("No filter"))
-e:value("global", translate("Global filter"))
-
-return m
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/black.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/black.lua
deleted file mode 100644
index 3fd32ec4e..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/black.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local fs = require "nixio.fs"
-local conffile = "/usr/share/adbyby/adblack.conf"
-
-f = SimpleForm("custom")
-
-t = f:field(TextValue, "conf")
-t.rmempty = true
-t.rows = 13
-function t.cfgvalue()
-	return fs.readfile(conffile) or ""
-end
-
-function f.handle(self, state, data)
-	if state == FORM_VALID then
-		if data.conf then
-			fs.writefile(conffile, data.conf:gsub("\r\n", "\n"))
-			luci.sys.call("/etc/init.d/adbyby restart")
-		end
-	end
-	return true
-end
-
-return f
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/block.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/block.lua
deleted file mode 100644
index dd715fd88..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/block.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local fs = require "nixio.fs"
-local conffile = "/usr/share/adbyby/blockip.conf"
-
-f = SimpleForm("custom")
-
-t = f:field(TextValue, "conf")
-t.rmempty = true
-t.rows = 13
-function t.cfgvalue()
-	return fs.readfile(conffile) or ""
-end
-
-function f.handle(self, state, data)
-	if state == FORM_VALID then
-		if data.conf then
-			fs.writefile(conffile, data.conf:gsub("\r\n", "\n"))
-			luci.sys.call("/etc/init.d/adbyby restart")
-		end
-	end
-	return true
-end
-
-return f
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/esc.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/esc.lua
deleted file mode 100644
index 5c6f168a1..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/esc.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local fs = require "nixio.fs"
-local conffile = "/usr/share/adbyby/adesc.conf"
-
-f = SimpleForm("custom")
-
-t = f:field(TextValue, "conf")
-t.rmempty = true
-t.rows = 13
-function t.cfgvalue()
-	return fs.readfile(conffile) or ""
-end
-
-function f.handle(self, state, data)
-	if state == FORM_VALID then
-		if data.conf then
-			fs.writefile(conffile, data.conf:gsub("\r\n", "\n"))
-			luci.sys.call("/etc/init.d/adbyby restart")
-		end
-	end
-	return true
-end
-
-return f
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/help.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/help.lua
deleted file mode 100644
index a0c20b90d..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/help.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local fs = require "nixio.fs"
-local conffile = "/usr/share/adbyby/adhost.conf"
-
-f = SimpleForm("custom")
-
-t = f:field(TextValue, "conf")
-t.rmempty = true
-t.rows = 13
-function t.cfgvalue()
-	return fs.readfile(conffile) or ""
-end
-
-function f.handle(self, state, data)
-	if state == FORM_VALID then
-		if data.conf then
-			fs.writefile(conffile, data.conf:gsub("\r\n", "\n"))
-			luci.sys.call("/etc/init.d/adbyby restart")
-		end
-	end
-	return true
-end
-
-return f
diff --git a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/user.lua b/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/user.lua
deleted file mode 100644
index 13887db99..000000000
--- a/luci-app-adbyby-plus/luasrc/model/cbi/adbyby/user.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local fs = require "nixio.fs"
-local conffile = "/usr/share/adbyby/rules.txt"
-
-f = SimpleForm("custom")
-
-t = f:field(TextValue, "conf")
-t.rmempty = true
-t.rows = 13
-function t.cfgvalue()
-	return fs.readfile(conffile) or ""
-end
-
-function f.handle(self, state, data)
-	if state == FORM_VALID then
-		if data.conf then
-			fs.writefile(conffile, data.conf:gsub("\r\n", "\n"))
-			luci.sys.call("/etc/init.d/adbyby restart")
-		end
-	end
-	return true
-end
-
-return f
diff --git a/luci-app-adbyby-plus/luasrc/view/adbyby/adbyby_status.htm b/luci-app-adbyby-plus/luasrc/view/adbyby/adbyby_status.htm
deleted file mode 100644
index 3b2f40e06..000000000
--- a/luci-app-adbyby-plus/luasrc/view/adbyby/adbyby_status.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-XHR.poll(3, '<%=url([[admin]], [[services]], [[adbyby]], [[run]])%>', null,
-	function(x, data) {
-		var tb = document.getElementById('adbyby_status');
-		if (data && tb) {
-			if (data.running) {
-				var links = '<em><b><font color=green>Adbyby Plus+ <%:RUNNING%></font></b></em>';
-				tb.innerHTML = links;
-			} else {
-				tb.innerHTML = '<em><b><font color=red>Adbyby Plus+ <%:NOT RUNNING%></font></b></em>';
-			}
-		}
-	}
-);
-//]]>
-</script>
-<style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
-<fieldset class="cbi-section">
-	<p id="adbyby_status">
-		<em><%:Collecting data...%></em>
-	</p>
-</fieldset>
diff --git a/luci-app-adbyby-plus/luasrc/view/adbyby/refresh.htm b/luci-app-adbyby-plus/luasrc/view/adbyby/refresh.htm
deleted file mode 100644
index 5c0285bcd..000000000
--- a/luci-app-adbyby-plus/luasrc/view/adbyby/refresh.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<%+cbi/valueheader%>
-<script type="text/javascript">//<![CDATA[
-	function refresh_data(btn,dataname)
-	{
-		btn.disabled = true;
-		btn.value = '<%:Refresh...%> ';
-		murl=dataname;
-		XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adbyby","refresh")%>',
-			{ set:murl },
-			function(x,rv)
-			{
-			var s = document.getElementById(dataname+'-status');
-			if (s)
-			{
-				if (rv.ret=="0")
-				s.innerHTML ="<font color='green'>"+"<%:No new data!%> "+"</font>";
-				else if(rv.ret=="-1")
-				{
-					s.innerHTML ="<font color='red'>"+"<%:Refresh Error!%> "+"</font>";
-				}
-				else
-					{
-				s.innerHTML ="<font color='green'>"+"<%:Refresh OK!%> "+"<%:Total Records:%>"+rv.ret+"</font>";
-			}
-			}
-				btn.disabled = false;
-				btn.value    = '<%:Refresh Data %>';
-			}
-		);
-		return false;
-	}
-//]]></script>
-<input type="button" class="cbi-button cbi-input-reload" value="<%:Refresh Data%> " onclick="return refresh_data(this,'<%=self.option%>')" />
-<span id="<%=self.option%>-status"><em><%=self.value%></em></span>
-<%+cbi/valuefooter%>
diff --git a/luci-app-adbyby-plus/po/zh-cn/adbyby.po b/luci-app-adbyby-plus/po/zh-cn/adbyby.po
deleted file mode 100644
index f82a0b38c..000000000
--- a/luci-app-adbyby-plus/po/zh-cn/adbyby.po
+++ /dev/null
@@ -1,198 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: dingpengyu <dingpengyu06@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"X-Generator: Poedit 2.3.1\n"
-
-msgid "ADBYBY Plus +"
-msgstr "广告屏蔽大师 Plus+"
-
-msgid "<strong><font color=\"green\">Adbyby Plus + is Running</font></strong>"
-msgstr "<strong><font color=\"green\">广告屏蔽大师 Plus + 正在运行</font></strong>"
-
-msgid "<strong><font color=\"red\">Adbyby Plus + is Not Running</font></strong>"
-msgstr "<strong><font color=\"red\">广告屏蔽大师 Plus + 没有运行</font></strong>"
-
-msgid "Adbyby Plus + can filter all kinds of banners, popups, video ads, and prevent tracking, privacy theft and a variety of malicious websites<br /><font color=\"red\">Plus + version combination mode can operation with Adblock Plus Host,filtering ads without losing bandwidth</font>"
-msgstr "广告屏蔽大师 Plus + 可以全面过滤各种横幅、弹窗、视频广告，同时阻止跟踪、隐私窃取及各种恶意网站<br /><font color=\"red\">Plus + 版本可以和 Adblock Plus Host 结合方式运行，过滤广告不损失带宽</font>"
-
-msgid "Adbyby Plus +"
-msgstr "广告屏蔽大师 Plus+"
-
-msgid "Adbyby Plus + Settings"
-msgstr "广告屏蔽大师 Plus+（支持  AdGuardHome /Host / DNSMASQ 规则）"
-
-msgid "Base Setting"
-msgstr "基本设置"
-
-msgid "Running Mode"
-msgstr "运行模式"
-
-msgid "Global Mode (The slowest and the best effects)"
-msgstr "全局模式（最慢, 效果最好）"
-
-msgid "Plus + Mode (Filter domain name list and blacklist website.Recommended)"
-msgstr "Plus + 模式（只过滤列表内域名结合ABP名单。推荐！）"
-
-msgid "No filter Mode (Must set in Client Filter Mode Settings manually)"
-msgstr "手动代理模式（必须手动设置浏览器代理，或者客户端过滤模式设置）"
-
-msgid "Transparent proxy"
-msgstr "透明代理"
-
-msgid "Click to disable"
-msgstr "点击关闭"
-
-msgid "Click to enable"
-msgstr "点击开启"
-
-msgid "Adbyby and Rule state"
-msgstr "规则状态"
-
-msgid "Restart Adbyby"
-msgstr "重启Adbyby"
-
-msgid "Plus+ Domain List"
-msgstr "Plus+ 模式过滤的域名"
-
-msgid "Bypass Domain List"
-msgstr "域名白名单"
-
-msgid "Black Domain List"
-msgstr "域名黑名单"
-
-msgid "Black IP List"
-msgstr "IP黑名单"
-
-msgid "Advance Setting"
-msgstr "高级设置"
-
-msgid "Update the rule at 6 a.m. every morning and restart adbyby"
-msgstr "每天凌晨6点更新规则并重启"
-
-msgid "ADP Host List"
-msgstr "Adblock Plus Hosts 记录数"
-
-msgid "Adblock Plus Data"
-msgstr "Adblock Plus 规则数据库"
-
-msgid "Subscribe 3rd Rules Data"
-msgstr "订阅第三方去广告规则"
-
-msgid "Records"
-msgstr "条记录"
-
-msgid "Refresh Data"
-msgstr "更新数据库"
-
-msgid "Refresh..."
-msgstr "正在更新，请稍候.."
-
-msgid "Refresh OK!"
-msgstr "更新成功！"
-
-msgid "Refresh Error!"
-msgstr "更新失败！"
-
-msgid "No new data!"
-msgstr "你已经是最新数据，无需更新！"
-
-msgid "Total Records:"
-msgstr "新的总纪录数："
-
-msgid "Delete All Subscribe Rules"
-msgstr "清空所有订阅的规则库"
-
-msgid "Anti-AD Rules Subscribe"
-msgstr "广告过滤规则订阅URL"
-
-msgid "AdGuardHome / Host / DNSMASQ rules auto-convert"
-msgstr "AdGuardHome / Host / DNSMASQ 规则自动识别"
-
-msgid "Manually force update<br />Adblock Plus Host List"
-msgstr "手动强制更新<br />Adblock Plus Host List"
-
-msgid "Update Adbyby Rules Manually"
-msgstr "手动更新规则"
-
-msgid "Block Apple iOS OTA update"
-msgstr "拦截 Apple iOS 的OTA更新"
-
-msgid "Block CNshort APP and Website"
-msgstr "拦截 短视频 APP 和网站"
-
-msgid "RAM Running Mode"
-msgstr "内存运行模式"
-
-msgid "Running Adbyby in RAM.More speed,less disk consumption"
-msgstr "在内存中运行Adbyby。更快的速度，更少的存储空间损耗"
-
-msgid "User-defined Rule"
-msgstr "用户自定义规则"
-
-msgid "<strong>Client Filter Mode Settings</strong>"
-msgstr "<strong>客户端过滤模式设置</strong>"
-
-msgid "Filter mode settings can be set to specific LAN clients ( <font color=blue> No filter , Global filter </font> ) . Does not need to be set by default."
-msgstr "可以为局域网客户端分别设置不同的过滤模式 ( <font color=blue> 不过滤 , 全局过滤 </font> ) 。默认无需设置。"
-
-msgid "IP Address"
-msgstr "IP地址"
-
-msgid "Filter Mode"
-msgstr "过滤模式"
-
-msgid "（!）Note that you should fill to the domain name ONLY. For example, http://www.baidu.com only needs to write to baidu.com. One line for each"
-msgstr "这些域名在 Plus 模式中会被过滤。你需要要填写域名即可，例如  http://www.baidu.com，你写 baidu.com 即可。每行一个域名"
-
-msgid "（!）Will Never filter these Domain"
-msgstr "永不过滤白名单内的域名（所有模式中生效）"
-
-msgid "（!）Will Always block these Domain"
-msgstr "拦截黑名单内的域名（所有模式中生效）"
-
-msgid "（!）Will Always block these IP"
-msgstr "拦截黑名单内的IP地址（所有模式中生效）"
-
-msgid "Each line of the beginning exclamation mark is considered an annotation."
-msgstr "每行一条规则，感叹号开头的被认为是注释。"
-
-msgid "<strong><font color=blue>Adblock Plus Host List：</font></strong>"
-msgstr "<strong><font color=blue>Adblock Plus Host 列表：</font></strong>"
-
-msgid "Note: It needs to download and convert the rules. The background process may takes 60-120 seconds to run. <br / > After completed it would automatically refresh, please do not duplicate click!"
-msgstr "注意：需要下载并转换规则。后台进程可能需要60-120秒运行。完成后会自动刷新，请不要重复点击！"
-
-msgid "No filter"
-msgstr "不过滤"
-
-msgid "Global filter"
-msgstr "全局过滤"
-
-msgid "Update adbyby rules form official website first"
-msgstr "优先从官方网站更新规则"
-
-msgid "Last Update Checked"
-msgstr "上一次检查规则更新"
-
-msgid "Lazy Rule"
-msgstr "正式版规则"
-
-msgid "Video Rule"
-msgstr "测试版规则"
-
-msgid "Adblock Plus Host List"
-msgstr "广告屏蔽大师 Plus 规则列表"
-
-msgid "Block Domain List"
-msgstr "域名黑名单"
-
-msgid "Block IP List"
-msgstr "IP黑名单"
diff --git a/luci-app-adbyby-plus/root/etc/config/adbyby b/luci-app-adbyby-plus/root/etc/config/adbyby
deleted file mode 100644
index d2afc6ed7..000000000
--- a/luci-app-adbyby-plus/root/etc/config/adbyby
+++ /dev/null
@@ -1,11 +0,0 @@
-
-config adbyby
-	option daemon '2'
-	option lan_mode '0'
-	option cron_mode '1'
-	option block_ios '0'
-	option enable '0'
-	option wan_mode '1'
-	option mem_mode '1'
-	option update_source '1'
-
diff --git a/luci-app-adbyby-plus/root/etc/init.d/adbyby b/luci-app-adbyby-plus/root/etc/init.d/adbyby
deleted file mode 100755
index 7fe29caba..000000000
--- a/luci-app-adbyby-plus/root/etc/init.d/adbyby
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=96
-STOP=10
-
-
-EXTRA_COMMANDS="add_rule del_rule reload_rule"
-PROG_PATH=/usr/share/adbyby
-DATA_PATH=$PROG_PATH/data
-WAN_FILE=/var/etc/dnsmasq-adbyby.d/03-adbyby-ipset.conf
-CRON_FILE=/etc/crontabs/root
-CONFIG=adbyby
-ipt_n="iptables -t nat"
-
-uci_get_by_name() {
-	local ret=$(uci get $CONFIG.$1.$2 2>/dev/null)
-	echo ${ret:=$3}
-}
-
-uci_get_by_type() {
-	local index=0
-	if [ -n $4 ]; then
-	
-		index=$4
-	fi
-	local ret=$(uci get $CONFIG.@$1[$index].$2 2>/dev/null)
-	echo ${ret:=$3}
-}
-
-get_config()
-{
-	config_get_bool enable $1 enable 0
-	config_get_bool cron_mode $1 cron_mode 1
-	config_get wan_mode $1 wan_mode 1
-	config_get_bool block_ios $1 block_ios 0
-	config_get_bool mem_mode $1 mem_mode 1
-	config_get_bool block_cnshort $1 block_cnshort 0
-}
-
-add_rules()
-{
-	rm -f $DATA_PATH/user.bin
-	grep -v ^! $PROG_PATH/rules.txt > $DATA_PATH/user.txt
-	cp $PROG_PATH/rules.txt $DATA_PATH/rules.txt
-}
-
-
-add_cron()
-{
-	if [ $cron_mode -eq 1 ]; then
-    sed -i '/adblock.sh/d' $CRON_FILE
-		echo '0 6 * * * /usr/share/adbyby/adblock.sh > /tmp/adupdate.log 2>&1' >> $CRON_FILE
-		crontab $CRON_FILE
-	fi
-}
-
-del_cron()
-{
-	sed -i '/adblock.sh/d' $CRON_FILE
-	/etc/init.d/cron restart
-}
-
-ip_rule()
-{
-
-  ipset -N adbyby_esc hash:ip
-  $ipt_n -A ADBYBY -m set --match-set adbyby_esc dst -j RETURN
-  
-  local icount=$(uci show adbyby | grep 'filter_mode' | wc -l)
-  let icount=icount-1
-	for i in $(seq 0 $icount)
-	do
-		local ip=$(uci_get_by_type acl_rule ipaddr '' $i)
-		local mode=$(uci_get_by_type acl_rule filter_mode '' $i)
-		case "$mode" in
-		disable)
-			$ipt_n -A ADBYBY -s $ip -j RETURN
-			;;
-		global)
-			$ipt_n -A ADBYBY -s $ip -p tcp -j REDIRECT --to-ports 8118
-			$ipt_n -A ADBYBY -s $ip -j RETURN
-			;;
-		esac
-	done
-	
-	
-	
-	case $wan_mode in
-		0)
-			;;
-		1)
-      ipset -N adbyby_wan hash:ip
-			$ipt_n -A ADBYBY -m set ! --match-set adbyby_wan dst -j RETURN
-			;;
-		2)
-			$ipt_n -A ADBYBY -j RETURN
-			;;
-	esac
-	
-	echo "create blockip hash:net family inet hashsize 1024 maxelem 65536" > /tmp/blockip.ipset
-  awk '!/^$/&&!/^#/{printf("add blockip %s'" "'\n",$0)}' /usr/share/adbyby/blockip.conf >> /tmp/blockip.ipset
-  ipset -! restore < /tmp/blockip.ipset 2>/dev/null
-  iptables -I FORWARD -m set --match-set blockip dst -j DROP
-  iptables -I OUTPUT -m set --match-set blockip dst -j DROP
-}
-
-add_dns()
-{
-		mkdir -p /var/etc/dnsmasq-adbyby.d
-    mkdir -p /tmp/dnsmasq.d
-
-    awk '!/^$/&&!/^#/{printf("ipset=/%s/'"adbyby_esc"'\n",$0)}' $PROG_PATH/adesc.conf > /var/etc/dnsmasq-adbyby.d/06-dnsmasq.esc
-    awk '!/^$/&&!/^#/{printf("address=/%s/'"0.0.0.0"'\n",$0)}' $PROG_PATH/adblack.conf > /var/etc/dnsmasq-adbyby.d/07-dnsmasq.black
-
-    echo 'conf-dir=/var/etc/dnsmasq-adbyby.d' > /tmp/dnsmasq.d/dnsmasq-adbyby.conf
-    
-	local var=1
-		if [ $wan_mode -eq 1 ]; then
-		awk '!/^$/&&!/^#/{printf("ipset=/%s/'"adbyby_wan"'\n",$0)}' $PROG_PATH/adhost.conf > $WAN_FILE
-		if ls /var/etc/dnsmasq-adbyby.d/* >/dev/null 2>&1; then
-      mkdir -p /tmp/dnsmasq.d
-      cp /usr/share/adbyby/dnsmasq.adblock /var/etc/dnsmasq-adbyby.d/04-dnsmasq.adblock
-      cp /usr/share/adbyby/dnsmasq.ads /var/etc/dnsmasq-adbyby.d/05-dnsmasq.ads
-	  fi
-	fi
-	
-	mkdir -p /tmp/adbyby/rules/data /tmp/adbyby/rules/host
-	rm -f /tmp/adbyby/rules/data/* /tmp/adbyby/rules/host/*
-	cp -a /usr/share/adbyby/rules/data/* /tmp/adbyby/rules/data 2>/dev/null
-	cp -a /usr/share/adbyby/rules/host/* /tmp/adbyby/rules/host 2>/dev/null
-	echo 'addn-hosts=/tmp/adbyby/rules/host/' >> /tmp/dnsmasq.d/dnsmasq-adbyby.conf
-	echo 'conf-dir=/tmp/adbyby/rules/data' >> /tmp/dnsmasq.d/dnsmasq-adbyby.conf
-	
-  [ $block_ios -eq 1 ] && echo 'address=/mesu.apple.com/0.0.0.0' >> /tmp/dnsmasq.d/dnsmasq-adbyby.conf
-  if [ $block_cnshort -eq 1 ]; then
-  cat <<-EOF >/tmp/etc/dnsmasq-adbyby.d/08-dnsmasq.cnshort
-address=/api.amemv.com/0.0.0.0
-address=/.amemv.com/0.0.0.0
-address=/.tiktokv.com/0.0.0.0
-address=/.snssdk.com/0.0.0.0
-address=/.douyin.com/0.0.0.0
-address=/.ixigua.com/0.0.0.0
-address=/.pstatp.com/0.0.0.0
-address=/.ixiguavideo.com/0.0.0.0
-address=/.v.kandian.qq.com/0.0.0.0
-address=/.yximgs.com/0.0.0.0
-address=/.gifshow.com/0.0.0.0
-address=/.ksapisrv.com/0.0.0.0
-address=/.kuaishoupay.com/0.0.0.0
-address=/.ksyun.com/0.0.0.0
-address=/.live.xycdn.com/0.0.0.0
-address=/.danuoyi.alicdn.com/0.0.0.0
-address=/.v.weishi.qq.com/0.0.0.0
-address=/.pearvideo.com/0.0.0.0
-address=/.miaopai.com/0.0.0.0
-address=/.kuaishou.com/0.0.0.0
-address=/.qupai.me/0.0.0.0
-address=/.meipai.com/0.0.0.0
-address=/.huoshan.com/0.0.0.0
-address=/.ergengtv.com/0.0.0.0
-address=/.baijiahao.baidu.com/0.0.0.0
-address=/.xiongzhang.baidu.com/0.0.0.0
-		EOF
-	fi
-}
-
-del_dns()
-{
-		rm -f /tmp/dnsmasq.d/dnsmasq-adbyby.conf
-		rm -f /var/etc/dnsmasq-adbyby.d/*
-		rm -f /tmp/adbyby_host.conf
-}
-
-
-add_rule()
-{
-	$ipt_n -N ADBYBY
-	$ipt_n -A ADBYBY -d 0.0.0.0/8 -j RETURN
-	$ipt_n -A ADBYBY -d 10.0.0.0/8 -j RETURN
-	$ipt_n -A ADBYBY -d 127.0.0.0/8 -j RETURN
-	$ipt_n -A ADBYBY -d 169.254.0.0/16 -j RETURN
-	$ipt_n -A ADBYBY -d 172.16.0.0/12 -j RETURN
-	$ipt_n -A ADBYBY -d 192.168.0.0/16 -j RETURN
-	$ipt_n -A ADBYBY -d 224.0.0.0/4 -j RETURN
-	$ipt_n -A ADBYBY -d 240.0.0.0/4 -j RETURN
-	ip_rule
-	if [ $(ipset list music -name -quiet | grep music) ]; then
-    $ipt_n -A ADBYBY -m set --match-set music dst -j RETURN 2>/dev/null
-	fi
-	$ipt_n -A ADBYBY -p tcp -j REDIRECT --to-ports 8118 2>/dev/null
-	$ipt_n -I PREROUTING -p tcp --dport 80 -j ADBYBY 2>/dev/null
-	
-	mkdir -p /var/etc
-	echo -e "/etc/init.d/adbyby restart" > "/var/etc/adbyby.include"
-}
-
-del_rule()
-{
-	$ipt_n -D PREROUTING -p tcp --dport 80 -j ADBYBY 2>/dev/null
-	$ipt_n -F ADBYBY 2>/dev/null
-	$ipt_n -X ADBYBY 2>/dev/null
-	iptables -D FORWARD -m set --match-set blockip dst -j DROP 2>/dev/null
-	iptables -D OUTPUT -m set --match-set blockip dst -j DROP 2>/dev/null
-	ipset -F adbyby_esc 2>/dev/null
-	ipset -X adbyby_esc 2>/dev/null
-	ipset -F adbyby_wan 2>/dev/null
-	ipset -X adbyby_wan 2>/dev/null
-	ipset -F blockip 2>/dev/null
-	ipset -X blockip 2>/dev/null
-}
-
-reload_rule()
-{
-	config_load adbyby
-	config_foreach get_config adbyby
-	del_rule
-	[ $enable -eq 0 ] && exit 0
-	add_rule
-}
-
-start()
-{
-	config_load adbyby
-	config_foreach get_config adbyby
-	
-	if [ $enable -ne 0 ];  then
-    add_cron
-    [ ! -d "/tmp/adbyby/data" ]  && cp -a /usr/share/adbyby /tmp/ && rm -f /tmp/adbyby.updated
-    add_rules
-    
-    /tmp/adbyby/adbyby >/dev/null 2>&1 &
-    
-    add_dns
-    add_rule
-    /etc/init.d/dnsmasq restart
-	fi
-}
-
-stop()
-{
-  kill -9 $(busybox ps -w | grep "/tmp/adbyby/adbyby" | grep -v grep | grep -v update| grep -v adblock | awk '{print $1}') >/dev/null 2>&1
-  config_load adbyby
-	config_foreach get_config adbyby
-	del_rule
-	del_cron
-	del_dns
-	/etc/init.d/dnsmasq restart
-}
-
-boot()
-{
-	mkdir -p /tmp/adbyby && cp -a /usr/share/adbyby /tmp/
-	start
-}
diff --git a/luci-app-adbyby-plus/root/etc/uci-defaults/luci-adbyby b/luci-app-adbyby-plus/root/etc/uci-defaults/luci-adbyby
deleted file mode 100755
index 33cfa4787..000000000
--- a/luci-app-adbyby-plus/root/etc/uci-defaults/luci-adbyby
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@adbyby[-1]
-	add ucitrack adbyby
-	set ucitrack.@adbyby[-1].init=adbyby
-	commit ucitrack
-	delete firewall.adbyby
-	set firewall.adbyby=include
-	set firewall.adbyby.type=script
-	set firewall.adbyby.path=/var/etc/adbyby.include
-	set firewall.adbyby.reload=1
-	delete firewall.adblock
-  add firewall rule
-  rename firewall.@rule[-1]="adblock"
-  set firewall.@rule[-1].name="adblock"
-  set firewall.@rule[-1].target="DROP"
-  set firewall.@rule[-1].src="wan"
-  set firewall.@rule[-1].proto="tcp"
-  set firewall.@rule[-1].dest_port="8118"
-	commit firewall
-EOF
-
-mkdir -p /etc/dnsmasq.d
-
-/etc/init.d/adbyby stop
-/etc/init.d/adbyby enable
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/luci-app-adbyby-plus/root/lib/upgrade/keep.d/adbyby b/luci-app-adbyby-plus/root/lib/upgrade/keep.d/adbyby
deleted file mode 100644
index 49b3eaafd..000000000
--- a/luci-app-adbyby-plus/root/lib/upgrade/keep.d/adbyby
+++ /dev/null
@@ -1,6 +0,0 @@
-/usr/share/adbyby/adhost.conf
-/usr/share/adbyby/adblack.conf
-/usr/share/adbyby/blockip.conf
-/usr/share/adbyby/adesc.conf
-/usr/share/adbyby/rules.txt
-/usr/share/adbyby/dnsmasq.adblock
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/ad-update b/luci-app-adbyby-plus/root/usr/share/adbyby/ad-update
deleted file mode 100755
index 77b43438f..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/ad-update
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-if [ -f /tmp/adnew.conf ]; then
-  if (grep -wq "address=" /tmp/adnew.conf) ; then
-    cp /tmp/adnew.conf /tmp/ad.conf
-  elif (grep -wq "0.0.0.0" /tmp/adnew.conf) ; then
-    cp /tmp/adnew.conf /tmp/ad.conf
-  else
-    cat /tmp/adnew.conf | grep ^\|\|[^\*]*\^$ | sed -e 's:||:address\=\/:' -e 's:\^:/0\.0\.0\.0:' > /tmp/ad.conf
-  fi
-fi
-rm -f /tmp/adnew.conf
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf b/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf
deleted file mode 100644
index a532f5825..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-gvod.aiseejapp.atianqi.com
-stat.pandora.xiaomi.com
-upgrade.mishop.pandora.xiaomi.com
-logonext.tv.kuyun.com
-config.kuyun.com
-mishop.pandora.xiaomi.com
-dvb.pandora.xiaomi.com
-api.ad.xiaomi.com
-de.pandora.xiaomi.com
-data.mistat.xiaomi.com
-jellyfish.pandora.xiaomi.com
-gallery.pandora.xiaomi.com
-o2o.api.xiaomi.com
-bss.pandora.xiaomi.com
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh b/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh
deleted file mode 100755
index 8224179dd..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adblock.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-uclient-fetch --no-check-certificate -O - 'https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt' > /tmp/adnew.conf
-if [ -s "/tmp/adnew.conf" ];then
-  /usr/share/adbyby/ad-update
-fi
-
-rm -f /tmp/adbyby.updated 
-sleep 10
-/etc/init.d/adbyby restart
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyfirst.sh b/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyfirst.sh
deleted file mode 100755
index 532fe182d..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyfirst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-PROG_PATH=$(pwd)
-$PROG_PATH/adbybyupdate.sh
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh b/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh
deleted file mode 100755
index 5143cca3d..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adbybyupdate.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-if [ ! -f "/tmp/adbyby.updated" ];then
-  wget_ok="0"
-  while [ "$wget_ok" = "0" ] 
-    do 
-    uclient-fetch --spider --quiet --timeout=3 http://www.baidu.com
-    if [ "$?" == "0" ]; then
-      wget_ok="1"
-      
-      touch /tmp/md5.json && uclient-fetch --no-check-certificate -T 10  -O /tmp/md5.json https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/md5.json
-      adm5=$(md5sum /tmp/md5.json | awk -F' ' '{print $1}')
-      touch /tmp/adbyby/admd5.json && bmd5=$(md5sum /tmp/adbyby/admd5.json | awk -F' ' '{print $1}')
-      if [ "$adm5" == "$bmd5" ];then
-         echo "Rules MD5 are the same!"
-         echo $(date "+%Y-%m-%d %H:%M:%S") > /tmp/adbyby.updated
-         exit 0
-      elif [ -s /tmp/md5.json ];then
-      
-        touch /tmp/lazy.txt && uclient-fetch --no-check-certificate -T 10  -O /tmp/lazy.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/lazy.txt
-        touch /tmp/video.txt && uclient-fetch --no-check-certificate -T 10  -O /tmp/video.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/video.txt
-        
-        touch /tmp/local-md5.json && md5sum /tmp/lazy.txt /tmp/video.txt > /tmp/local-md5.json
-        
-        
-        lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
-        video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')  
-        lazy_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '2p')
-        video_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '4p')
-        
-        if [ "$lazy_online"x == "$lazy_local"x -a "$video_online"x == "$video_local"x ]; then
-            echo "adbyby rules MD5 OK!"
-            mv /tmp/lazy.txt /tmp/adbyby/data/lazy.txt
-            mv /tmp/video.txt /tmp/adbyby/data/video.txt
-            mv /tmp/md5.json /tmp/adbyby/admd5.json
-            echo $(date "+%Y-%m-%d %H:%M:%S") > /tmp/adbyby.updated
-         fi
-      fi  
-    else
-      sleep 10
-    fi
-   done
-   
-   rm -f /tmp/adbyby/data/*.bak
-    
-   kill -9 $(busybox ps -w | grep "/tmp/adbyby/adbyby" | grep -v grep | grep -v update| grep -v adblock | awk '{print $1}') >/dev/null 2>&1
-   /tmp/adbyby/adbyby >/dev/null 2>&1 &
-fi
-
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adesc.conf b/luci-app-adbyby-plus/root/usr/share/adbyby/adesc.conf
deleted file mode 100644
index c5898a128..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adesc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-weixin.qq.com
-qpic.cn
-imtt.qq.com
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adhost.conf b/luci-app-adbyby-plus/root/usr/share/adbyby/adhost.conf
deleted file mode 100644
index 5f4f1a124..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adhost.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-cbjs.baidu.com
-list.video.baidu.com
-nsclick.baidu.com
-play.baidu.com
-sclick.baidu.com
-tieba.baidu.com
-baidustatic.com
-bdimg.com
-bdstatic.com
-share.baidu.com
-hm.baidu.com
-v.baidu.com
-cpro.baidu.com
-1000fr.net
-atianqi.com
-56.com
-v-56.com
-acfun.com
-acfun.tv
-baofeng.com
-baofeng.net
-cntv.cn
-hoopchina.com.cn
-funshion.com
-fun.tv
-hitvs.cn
-hljtv.com
-iqiyi.com
-qiyi.com
-agn.aty.sohu.com
-itc.cn
-kankan.com
-ku6.com
-letv.com
-letvcloud.com
-letvimg.com
-pplive.cn
-pps.tv
-ppsimg.com
-pptv.com
-www.qq.com
-l.qq.com
-v.qq.com
-video.sina.com.cn
-tudou.com
-wasu.cn
-analytics-union.xunlei.com
-kankan.xunlei.com
-youku.com
-hunantv.com
-ifeng.com
-renren.com
-mediav.com
-cnbeta.com
-mydrivers.com
-168f.info
-doubleclick.net
-126.net
-sohu.com
-right.com.cn
-50bang.org
-you85.cn
-jiuzhilan.com
-googles.com
-cnbetacdn.com
-ptqy.gitv.tv
-admaster.com.cn
-serving-sys.com
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh b/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh
deleted file mode 100755
index 36d6deb19..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/admem.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-if [ ! -f "/tmp/adbyby.updated" ];then
-  touch /tmp/adbyby.mem
-  wget_ok="0"
-  while [ "$wget_ok" = "0" ] 
-    do 
-    uclient-fetch --spider --quiet --tries=1 --timeout=3 www.baidu.com
-    if [ "$?" == "0" ]; then
-      wget_ok="1"
-      
-      touch /tmp/md5.json && uclient-fetch --no-check-certificate -t 1 -T 10 -O /tmp/md5.json https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/md5.json
-      adm5=$(md5sum /tmp/md5.json | awk -F' ' '{print $1}')
-      touch /tmp/adbyby/admd5.json && bmd5=$(md5sum /tmp/adbyby/admd5.json | awk -F' ' '{print $1}')
-      if [ "$adm5" == "$bmd5" ];then
-         echo "Rules MD5 are the same!"
-         echo $(date "+%Y-%m-%d %H:%M:%S") > /tmp/adbyby.updated
-         exit 0
-      else
-      
-        touch /tmp/lazy.txt && uclient-fetch --no-check-certificate -t 1 -T 10 -O /tmp/lazy.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/lazy.txt
-        touch /tmp/video.txt && uclient-fetch --no-check-certificate -t 1 -T 10 -O /tmp/video.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/video.txt
-        
-        touch /tmp/local-md5.json && md5sum /tmp/lazy.txt /tmp/video.txt > /tmp/local-md5.json
-        
-        
-        lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
-        video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')  
-        lazy_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '2p')
-        video_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '4p')
-        
-        if [ "$lazy_online"x == "$lazy_local"x -a "$video_online"x == "$video_local"x ]; then
-            echo "adbyby rules MD5 OK!"
-            mv /tmp/lazy.txt /tmp/adbyby/data/lazy.txt
-            mv /tmp/video.txt /tmp/adbyby/data/video.txt
-            mv /tmp/md5.json /tmp/adbyby/admd5.json
-            echo $(date "+%Y-%m-%d %H:%M:%S") > /tmp/adbyby.updated
-         fi
-      fi  
-    else
-      sleep 10
-    fi
-   done
-    
-   sleep 10 && /etc/init.d/adbyby restart
-fi
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh b/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
deleted file mode 100755
index 7ae9e6424..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-rm -f /usr/share/adbyby/data/*.bak
-
-touch /tmp/local-md5.json && md5sum /usr/share/adbyby/data/lazy.txt /usr/share/adbyby/data/video.txt > /tmp/local-md5.json
-touch /tmp/md5.json && uclient-fetch --no-check-certificate -T 10 -O /tmp/md5.json https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/md5.json
-
-lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
-video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')  
-lazy_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '2p')
-video_online=$(sed  's/":"/\n/g' /tmp/md5.json  |  sed  's/","/\n/g' | sed -n '4p')
-
-if [ "$lazy_online"x != "$lazy_local"x -o "$video_online"x != "$video_local"x ]; then
-    echo "MD5 not match! Need update!"
-    touch /tmp/lazy.txt && uclient-fetch --no-check-certificate -T 10 -O /tmp/lazy.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/lazy.txt
-    touch /tmp/video.txt && uclient-fetch --no-check-certificate -T 10 -O /tmp/video.txt https://adbyby.coding.net/p/xwhyc-rules/d/xwhyc-rules/git/raw/master/video.txt
-    touch /tmp/local-md5.json && md5sum /tmp/lazy.txt /tmp/video.txt > /tmp/local-md5.json
-    lazy_local=$(grep 'lazy' /tmp/local-md5.json | awk -F' ' '{print $1}')
-    video_local=$(grep 'video' /tmp/local-md5.json | awk -F' ' '{print $1}')
-    if [ "$lazy_online"x == "$lazy_local"x -a "$video_online"x == "$video_local"x ]; then
-      echo "New rules MD5 match!"
-      mv /tmp/lazy.txt /usr/share/adbyby/data/lazy.txt
-      mv /tmp/video.txt /usr/share/adbyby/data/video.txt
-      echo $(date +"%Y-%m-%d %H:%M:%S") > /tmp/adbyby.updated
-     fi
-else
-     echo "MD5 match! No need to update!"
-fi
-
-rm -f /tmp/lazy.txt /tmp/video.txt /tmp/local-md5.json /tmp/md5.json
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/blockip.conf b/luci-app-adbyby-plus/root/usr/share/adbyby/blockip.conf
deleted file mode 100644
index 55cb84b53..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/blockip.conf
+++ /dev/null
@@ -1 +0,0 @@
-2.2.2.2
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.adblock b/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.adblock
deleted file mode 100644
index e69de29bb..000000000
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.ads b/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.ads
deleted file mode 100644
index ec1a22189..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.ads
+++ /dev/null
@@ -1,4 +0,0 @@
-address=/p.tanx.com/0.0.0.0
-address=/googlesyndication.com/0.0.0.0
-address=/linkvans.com/0.0.0.0
-server=/valf.atm.youku.com/114.114.114.114
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.esc b/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.esc
deleted file mode 100644
index 6cfd87056..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/dnsmasq.esc
+++ /dev/null
@@ -1,3 +0,0 @@
-ipset=/weixin.qq.com/adbyby_wan
-ipset=/qpic.cn/adbyby_wan
-ipset=/imtt.qq.com/adbyby_wan
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/firewall.include b/luci-app-adbyby-plus/root/usr/share/adbyby/firewall.include
deleted file mode 100755
index 4dcec1e26..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/firewall.include
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ -f /tmp/blockip.ipset ];then
-
-adbyby_enable=$(uci get adbyby.@adbyby[0].enable)
-
-if [ $adbyby_enable -eq 1 ]; then
-	if pidof adbyby>/dev/null; then
-	  /etc/init.d/adbyby reload_rule
-	 else
-	   /etc/init.d/adbyby restart
-  fi
-fi
-
-fi
-
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/rule-count b/luci-app-adbyby-plus/root/usr/share/adbyby/rule-count
deleted file mode 100755
index 9f7388738..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/rule-count
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-find $1 -type f -exec cat {} \; | wc -l
\ No newline at end of file
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/rule-update b/luci-app-adbyby-plus/root/usr/share/adbyby/rule-update
deleted file mode 100755
index 95239bac8..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/rule-update
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-
-url_md5() {
-  echo -n $1|md5sum|cut -d ' ' -f1
-}
-
-convert_rules() {
-mkdir -p /tmp/rules/data
-mkdir -p /tmp/rules/host
-
-uclient-fetch -q --no-check-certificate $1 -O /tmp/adnew.conf
-
-rulename=$(url_md5 $1)
-
-if [ -f /tmp/adnew.conf ]; then
-  if (grep -wq "address=" /tmp/adnew.conf) ; then
-    cp /tmp/adnew.conf /tmp/rules/data/$rulename.conf
-  elif (grep -wq -e"0.0.0.0" -e"127.0.0.1" /tmp/adnew.conf) ; then
-    cp /tmp/adnew.conf /tmp/rules/host/$rulename.txt
-  else
-    cat /tmp/adnew.conf | grep ^\|\|[^\*]*\^$ | sed -e 's:||:address\=\/:' -e 's:\^:/0\.0\.0\.0:' > /tmp/rules/data/$rulename.conf
-  fi
-fi
-rm -rf /tmp/adnew.conf
-}
-
-ARRAY=$(uci get adbyby.@adbyby[0].subscribe_url 2> /dev/null)
-
-rm -rf /tmp/rules
-
-i=1
-for j in $ARRAY
-do
-  convert_rules $j
-  i=`expr $i + 1`
-done
\ No newline at end of file
diff --git a/luci-app-adbyby-plus/root/usr/share/adbyby/rules.txt b/luci-app-adbyby-plus/root/usr/share/adbyby/rules.txt
deleted file mode 100644
index 5c44b0e8c..000000000
--- a/luci-app-adbyby-plus/root/usr/share/adbyby/rules.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-!  ------------------------------ ADByby 自定义过滤语法简表---------------------------------
-!  --------------  规则基于abp规则，并进行了字符替换部分的扩展-----------------------------
-!  ABP规则请参考https://adblockplus.org/zh_CN/filters，下面为大致摘要
-!  "!" 为行注释符，注释行以该符号起始作为一行注释语义，用于规则描述
-!  "*" 为字符通配符，能够匹配0长度或任意长度的字符串，该通配符不能与正则语法混用。
-!  "^" 为分隔符，可以是除了字母、数字或者 _ - . % 之外的任何字符。
-!  "|" 为管线符号，来表示地址的最前端或最末端
-!  "||" 为子域通配符，方便匹配主域名下的所有子域。
-!  "~" 为排除标识符，通配符能过滤大多数广告，但同时存在误杀, 可以通过排除标识符修正误杀链接。
-!  "##" 为元素选择器标识符，后面跟需要隐藏元素的CSS样式例如 #ad_id  .ad_class
-!!  元素隐藏暂不支持全局规则和排除规则
-!! 字符替换扩展
-!  文本替换选择器标识符，后面跟需要替换的文本数据，格式：$s@模式字符串@替换后的文本@
-!  支持通配符*和？
-!  -------------------------------------------------------------------------------------------