diff --git a/ffrn-experimental-to-stable/Makefile b/ffrn-experimental-to-stable/Makefile
deleted file mode 100644
index 5f8eb2f184f2435c5f145c617e2a1a5a60f396f3..0000000000000000000000000000000000000000
--- a/ffrn-experimental-to-stable/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffrn-experimental-to-stable
-PKG_VERSION:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(GLUONDIR)/include/package.mk
-
-define Package/ffrn-experimental-to-stable
- SECTION:=gluon
- CATEGORY:=Gluon
- TITLE:=Move nodes from experimental to stable
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/ffrn-experimental-to-stable/install
- $(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ffrn-experimental-to-stable))
diff --git a/ffrn-experimental-to-stable/files/lib/gluon/upgrade/100-ffrn-experimental-to-stable b/ffrn-experimental-to-stable/files/lib/gluon/upgrade/100-ffrn-experimental-to-stable
deleted file mode 100755
index b3489599ba36f3187d5680d5b04931f92753de73..0000000000000000000000000000000000000000
--- a/ffrn-experimental-to-stable/files/lib/gluon/upgrade/100-ffrn-experimental-to-stable
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sed -i "s/option branch 'experimental'/option branch 'stable'/g" /etc/config/autoupdater
diff --git a/ffrn-gluon-config-mode-mesh-vpn/Makefile b/ffrn-gluon-config-mode-mesh-vpn/Makefile
deleted file mode 100644
index 2ebd262101ffc06a3a1b5a634c1dfeeda719040d..0000000000000000000000000000000000000000
--- a/ffrn-gluon-config-mode-mesh-vpn/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffrn-gluon-config-mode-mesh-vpn
-PKG_VERSION:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(GLUONDIR)/include/package.mk
-
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
-
-define Package/ffrn-gluon-config-mode-mesh-vpn
- SECTION:=gluon
- CATEGORY:=Gluon
- TITLE:=Toggle mesh-vpn and bandwidth limit
- DEPENDS:=gluon-config-mode-core-virtual +gluon-mesh-vpn-fastd +gluon-simple-tc
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
- $(call GluonBuildI18N,ffrn-gluon-config-mode-mesh-vpn,i18n)
-endef
-
-define Package/ffrn-gluon-config-mode-mesh-vpn/install
- $(CP) ./files/* $(1)/
- $(call GluonInstallI18N,ffrn-gluon-config-mode-mesh-vpn,$(1))
-endef
-
-$(eval $(call BuildPackage,ffrn-gluon-config-mode-mesh-vpn))
diff --git a/ffrn-gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua b/ffrn-gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
deleted file mode 100644
index 9bd314861b0aaaba1b9fb94c2ced31e86d8615a1..0000000000000000000000000000000000000000
--- a/ffrn-gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local uci = luci.model.uci.cursor()
-local meshvpn_enabled = uci:get("fastd", "mesh_vpn", "enabled", "0")
-
-if meshvpn_enabled ~= "1" then
- return nil
-else
- local i18n = require "luci.i18n"
- local util = require "luci.util"
- local site = require 'gluon.site_config'
- local sysconfig = require 'gluon.sysconfig'
-
- local pubkey = util.trim(util.exec("/etc/init.d/fastd show_key " .. "mesh_vpn"))
- local hostname = uci:get_first("system", "system", "hostname")
-
- local msg = i18n.translate('gluon-config-mode:pubkey')
-
- return function ()
- luci.template.render_string(msg, { pubkey=pubkey
- , hostname=hostname
- , site=site
- , sysconfig=sysconfig
- })
- end
-end
diff --git a/ffrn-gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua b/ffrn-gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
deleted file mode 100644
index 669a7bc34fe9f2724d7953a4214771cb82f6a0d3..0000000000000000000000000000000000000000
--- a/ffrn-gluon-config-mode-mesh-vpn/files/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-local cbi = require "luci.cbi"
-local i18n = require "luci.i18n"
-local uci = luci.model.uci.cursor()
-
-local M = {}
-
-function M.section(form)
- local msg = i18n.translate('Your internet connection can be used to establish an ' ..
- 'encrypted connection with other nodes. ' ..
- 'Enable this option if there are no other nodes reachable ' ..
- 'over WLAN in your vicinity or you want to make a part of ' ..
- 'your connection\'s bandwidth available for the network. You can limit how ' ..
- 'much bandwidth the node will use at most.')
- local s = form:section(cbi.SimpleSection, nil, msg)
-
- local o
-
- o = s:option(cbi.Flag, "_meshvpn", i18n.translate("Use internet connection (mesh VPN)"))
- o.default = uci:get_bool("fastd", "mesh_vpn", "enabled") and o.enabled or o.disabled
- o.rmempty = false
-
- o = s:option(cbi.Flag, "_limit_enabled", i18n.translate("Limit bandwidth"))
- o:depends("_meshvpn", "1")
- o.default = uci:get_bool("gluon-simple-tc", "mesh_vpn", "enabled") and o.enabled or o.disabled
- o.rmempty = false
-
- o = s:option(cbi.Value, "_limit_ingress", i18n.translate("Downstream (kbit/s)"))
- o:depends("_limit_enabled", "1")
- o.value = uci:get("gluon-simple-tc", "mesh_vpn", "limit_ingress")
- o.rmempty = false
- o.datatype = "integer"
-
- o = s:option(cbi.Value, "_limit_egress", i18n.translate("Upstream (kbit/s)"))
- o:depends("_limit_enabled", "1")
- o.value = uci:get("gluon-simple-tc", "mesh_vpn", "limit_egress")
- o.rmempty = false
- o.datatype = "integer"
-end
-
-function M.handle(data)
- uci:set("fastd", "mesh_vpn", "enabled", data._meshvpn)
- uci:save("fastd")
- uci:commit("fastd")
-
- -- checks for nil needed due to o:depends(...)
- if data._limit_enabled ~= nil then
- uci:set("gluon-simple-tc", "mesh_vpn", "interface")
- uci:set("gluon-simple-tc", "mesh_vpn", "enabled", data._limit_enabled)
- uci:set("gluon-simple-tc", "mesh_vpn", "ifname", "mesh-vpn")
-
- if data._limit_ingress ~= nil then
- uci:set("gluon-simple-tc", "mesh_vpn", "limit_ingress", data._limit_ingress)
- end
-
- if data._limit_egress ~= nil then
- uci:set("gluon-simple-tc", "mesh_vpn", "limit_egress", data._limit_egress)
- end
-
- uci:commit("gluon-simple-tc")
- uci:commit("gluon-simple-tc")
- end
-end
-
-return M
diff --git a/ffrn-gluon-config-mode-mesh-vpn/i18n/de.po b/ffrn-gluon-config-mode-mesh-vpn/i18n/de.po
deleted file mode 100644
index 8c613aa0c04c522b27fe51de511f13de56146de2..0000000000000000000000000000000000000000
--- a/ffrn-gluon-config-mode-mesh-vpn/i18n/de.po
+++ /dev/null
@@ -1,36 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-03-19 22:05+0100\n"
-"Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
-"Language-Team: German\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Downstream (kbit/s)"
-msgstr "Downstream (kbit/s)"
-
-msgid "Limit bandwidth"
-msgstr "Bandbreite begrenzen"
-
-msgid "Upstream (kbit/s)"
-msgstr "Upstream (kbit/s)"
-
-msgid "Use internet connection (mesh VPN)"
-msgstr "Internetverbindung nutzen (Mesh-VPN)"
-
-msgid ""
-"Your internet connection can be used to establish an encrypted connection "
-"with other nodes. Enable this option if there are no other nodes reachable "
-"over WLAN in your vicinity or you want to make a part of your connection's "
-"bandwidth available for the network. You can limit how much bandwidth the "
-"node will use at most."
-msgstr ""
-"Dein Knoten kann deine Internetverbindung nutzen um darüber eine "
-"verschlüsselte Verbindung zu anderen Knoten aufzubauen. Die dafür "
-"genutzte Bandbreite kannst du beschränken. Aktiviere die Option, falls keine "
-"per WLAN erreichbaren Nachbarknoten in deiner Nähe sind oder du deine "
-"Internetverbindung für das Mesh-Netzwerk zur Verfügung stellen möchtest."
diff --git a/ffrn-gluon-config-mode-mesh-vpn/i18n/fr.po b/ffrn-gluon-config-mode-mesh-vpn/i18n/fr.po
deleted file mode 100644
index 9c13fc13c296ae37568911db23bd618aeec64907..0000000000000000000000000000000000000000
--- a/ffrn-gluon-config-mode-mesh-vpn/i18n/fr.po
+++ /dev/null
@@ -1,36 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-08-12 23:30+0100\n"
-"Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
-"Language-Team: French\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Downstream (kbit/s)"
-msgstr "Débit déscendant (kbit/s)"
-
-msgid "Limit bandwidth"
-msgstr "Limiter la bande passante"
-
-msgid "Upstream (kbit/s)"
-msgstr "Débit ascendant (kbit/s)"
-
-msgid "Use internet connection (mesh VPN)"
-msgstr "Utiliser la connection internet (Mesh-VPN)"
-
-msgid ""
-"Your internet connection can be used to establish an encrypted connection "
-"with other nodes. Enable this option if there are no other nodes reachable "
-"over WLAN in your vicinity or you want to make a part of your connection's "
-"bandwidth available for the network. You can limit how much bandwidth the "
-"node will use at most."
-msgstr ""
-"Votre noeud peut partager votre accès internet grâce une communication encryptée "
-"avec d'autres noeuds. Vous pouvez limiter la bande passante utilisée par ceci. "
-"Active cette option, si vous n'avez pas d'autres noeuds atteignables par WLAN "
-"ou si vous voulez partager votre bande passante pour le réseau MESH."
-
diff --git a/ffrn-gluon-config-mode-mesh-vpn/i18n/gluon-config-mode-mesh-vpn.pot b/ffrn-gluon-config-mode-mesh-vpn/i18n/gluon-config-mode-mesh-vpn.pot
deleted file mode 100644
index 52e2eef8acebab13800df56ff7f487b3647733b4..0000000000000000000000000000000000000000
--- a/ffrn-gluon-config-mode-mesh-vpn/i18n/gluon-config-mode-mesh-vpn.pot
+++ /dev/null
@@ -1,22 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-msgid "Downstream (kbit/s)"
-msgstr ""
-
-msgid "Limit bandwidth"
-msgstr ""
-
-msgid "Upstream (kbit/s)"
-msgstr ""
-
-msgid "Use internet connection (mesh VPN)"
-msgstr ""
-
-msgid ""
-"Your internet connection can be used to establish an encrypted connection "
-"with other nodes. Enable this option if there are no other nodes reachable "
-"over WLAN in your vicinity or you want to make a part of your connection's "
-"bandwidth available for the network. You can limit how much bandwidth the "
-"node will use at most."
-msgstr ""
diff --git a/ffrn-remove-old-vlan/Makefile b/ffrn-remove-old-vlan/Makefile
deleted file mode 100644
index f76424617198e519a408b400dc5dd53e21d8f94b..0000000000000000000000000000000000000000
--- a/ffrn-remove-old-vlan/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffrn-remove-old-vlan
-PKG_VERSION:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(GLUONDIR)/include/package.mk
-
-define Package/ffrn-remove-old-vlan
- SECTION:=gluon
- CATEGORY:=Gluon
- TITLE:=Remove old config parts surviving the upgrade to 0.5.12
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/ffrn-remove-old-vlan/install
- $(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ffrn-remove-old-vlan))
diff --git a/ffrn-remove-old-vlan/files/lib/gluon/upgrade/100-ffrn-remove-old-vlan b/ffrn-remove-old-vlan/files/lib/gluon/upgrade/100-ffrn-remove-old-vlan
deleted file mode 100755
index 1081496b4b7c83675f3227d13c12fd510d7f72a5..0000000000000000000000000000000000000000
--- a/ffrn-remove-old-vlan/files/lib/gluon/upgrade/100-ffrn-remove-old-vlan
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sed -ie "/config interface 'mesh_radio0_vlan'/ { N;N;N;N;N; d; }" /etc/config/network