diff --git a/net-mgmt/snmp/Makefile b/net-mgmt/snmp/Makefile
index 3e77f3ff1..1fc97eee6 100644
--- a/net-mgmt/snmp/Makefile
+++ b/net-mgmt/snmp/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		snmp
-PLUGIN_VERSION=		0.1
-PLUGIN_PRIVATE=		yes
+PLUGIN_VERSION=		1.0
 PLUGIN_DEPENDS=		bsnmp-regex bsnmp-ucd
 PLUGIN_COMMENT=		SNMP Server via bsnmpd
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/igmp-proxy/Makefile b/net/igmp-proxy/Makefile
index 1d764093b..4fb29fa4a 100644
--- a/net/igmp-proxy/Makefile
+++ b/net/igmp-proxy/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		igmp-proxy
-PLUGIN_VERSION=		0.1
-PLUGIN_PRIVATE=		yes
+PLUGIN_VERSION=		1.0
 PLUGIN_DEPENDS=		igmpproxy
 PLUGIN_COMMENT=		IGMP-Proxy Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc
index 3ade627be..2f4f3cdbd 100644
--- a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc
+++ b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc
@@ -30,33 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* BEGIN remove this in 17.1: provide compat for newer plugin on stock 16.7 */
-require_once 'util.inc';
-
-if (!function_exists('url_safe')) {
-    function url_safe($format, $args = array())
-    {
-        if (!is_array($args)) {
-            /* just in case there's only one argument */
-            $args = array($args);
-        }
-
-        foreach ($args as $id => $arg) {
-            $args[$id] = urlencode($arg);
-        }
-
-        return vsprintf($format, $args);
-    }
-}
-
-require_once 'interfaces.lib.inc';
-
-if (!function_exists('legacy_netgraph_attach')) {
-    function legacy_netgraph_attach($if) { return; }
-}
-
-/* END remove this in 17.1 */
-
 function if_l2tp_configure()
 {
     return array('if_l2tp_configure_do');
diff --git a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc
index d07d22a9e..2294b322c 100644
--- a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc
+++ b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc
@@ -30,34 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* BEGIN remove this in 17.1: provide compat for newer plugin on stock 16.7 */
-
-require_once 'util.inc';
-
-if (!function_exists('url_safe')) {
-    function url_safe($format, $args = array())
-    {
-        if (!is_array($args)) {
-            /* just in case there's only one argument */
-            $args = array($args);
-        }
-
-        foreach ($args as $id => $arg) {
-            $args[$id] = urlencode($arg);
-        }
-
-        return vsprintf($format, $args);
-    }
-}
-
-require_once 'interfaces.lib.inc';
-
-if (!function_exists('legacy_netgraph_attach')) {
-    function legacy_netgraph_attach($if) { return; }
-}
-
-/* END remove this in 17.1 */
-
 function if_pppoe_configure()
 {
     return array('if_pppoe_configure_do');
diff --git a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc
index 72a6db2ae..4487b6b79 100644
--- a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc
+++ b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc
@@ -30,34 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* BEGIN remove this in 17.1: provide compat for newer plugin on stock 16.7 */
-
-require_once 'util.inc';
-
-if (!function_exists('url_safe')) {
-    function url_safe($format, $args = array())
-    {
-        if (!is_array($args)) {
-            /* just in case there's only one argument */
-            $args = array($args);
-        }
-
-        foreach ($args as $id => $arg) {
-            $args[$id] = urlencode($arg);
-        }
-
-        return vsprintf($format, $args);
-    }
-}
-
-require_once 'interfaces.lib.inc';
-
-if (!function_exists('legacy_netgraph_attach')) {
-    function legacy_netgraph_attach($if) { return; }
-}
-
-/* END remove this in 17.1 */
-
 function if_pptp_configure()
 {
     return array('if_pptp_configure_do');
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index c2aa3dbd8..fd096396f 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		relayd
-PLUGIN_VERSION=		0.1
-PLUGIN_PRIVATE=		yes
+PLUGIN_VERSION=		1.0
 PLUGIN_DEPENDS=		relayd
 PLUGIN_COMMENT=		Relayd Load Balancer
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/upnp/Makefile b/net/upnp/Makefile
index 027f6b11f..dac4da503 100644
--- a/net/upnp/Makefile
+++ b/net/upnp/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		upnp
-PLUGIN_VERSION=		0.1
-PLUGIN_PRIVATE=		yes
+PLUGIN_VERSION=		1.0
 PLUGIN_DEPENDS=		miniupnpd
 PLUGIN_COMMENT=		Universal Plug and Play Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 2354481d8..0d5c8e82c 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		wol
-PLUGIN_VERSION=		0.1
-PLUGIN_PRIVATE=		yes
+PLUGIN_VERSION=		1.0
 PLUGIN_DEPENDS=		wol
 PLUGIN_COMMENT=		Wake on LAN Service
 PLUGIN_MAINTAINER=	franco@opnsense.org