diff --git a/ffpb/gluon-batman-on-wan/Makefile b/ffpb/gluon-batman-on-wan/Makefile
deleted file mode 100644
index dd26cad4e254ae247bcad606a03b181798675025..0000000000000000000000000000000000000000
--- a/ffpb/gluon-batman-on-wan/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME := gluon-batman-on-wan
-PKG_VERSION := 2
-PKG_RELEASE:=$(GLUON_VERSION).$(GLUON_SITE_CODE)-$(GLUON_RELEASE).$(GLUON_CONFIG_VERSION)
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-batman-on-wan
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=Option to enable mesh (batadv) on WAN port
-  DEPENDS:=+gluon-core +gluon-mesh-batman-adv +luci-lib-core
-endef
-
-define Package/gluon-batman-on-wan/description
-	Gluon community wifi mesh firmware framework:
-
-	This adds an interface named wan_mesh which will be part of bat0
-	so nodes can be connected over batman-adv.
-
-	The default option must be set using the site.conf option batman_on_wan to
-	either 0 (disabled) or 1 (enabled).
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-batman-on-wan/install
-	$(CP) ./files/* $(1)/
-
-	$(INSTALL_DIR) $(1)/lib/gluon
-endef
-
-$(eval $(call BuildPackage,gluon-batman-on-wan))
diff --git a/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan b/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
deleted file mode 100644
index aa1711958f4be9a20485a3e3efe87cde0bc66413..0000000000000000000000000000000000000000
--- a/ffpb/gluon-batman-on-wan/files/lib/gluon/upgrade/batman-on-wan/initial/020-batman-on-wan
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-local sysconfig = require 'gluon.sysconfig'
-local uci = require 'luci.model.uci'
-
-local c = uci.cursor()
-
-c:section('network', 'interface', 'mesh_wan',
-	{
-		ifname = 'br-wan',
-		proto = 'batadv',
-		mesh = 'bat0',
-		auto = site.batman_on_wan,
-	}
-)
-
-c:save('network')
-c:commit('network')
diff --git a/ffpb/gluon-luci-portconfig/Makefile b/ffpb/gluon-luci-portconfig/Makefile
deleted file mode 100644
index 92468daa928c32eb25607cf56ec8924d9c4a65ed..0000000000000000000000000000000000000000
--- a/ffpb/gluon-luci-portconfig/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2013 Nils Schneider <nils at nilsschneider.net>
-# This is free software, licensed under the Apache 2.0 license.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-luci-portconfig
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-luci-portconfig
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=Luci module for advanced ethernet port configuration
-  DEPENDS:=+gluon-luci-admin +gluon-batman-on-wan
-endef
-
-define Package/gluon-luci-portconfig/description
-	Luci module for advanced ethernet port configuration
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-luci-portconfig/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-luci-portconfig))
diff --git a/ffpb/gluon-luci-portconfig/files/usr/lib/lua/luci/controller/admin/portconfig.lua b/ffpb/gluon-luci-portconfig/files/usr/lib/lua/luci/controller/admin/portconfig.lua
deleted file mode 100644
index ff0e0af24cddaa76b9cd0833e3e28fdaf6f6021b..0000000000000000000000000000000000000000
--- a/ffpb/gluon-luci-portconfig/files/usr/lib/lua/luci/controller/admin/portconfig.lua
+++ /dev/null
@@ -1,20 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2013 Nils Schneider <nils@nilsschneider.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-module("luci.controller.admin.portconfig", package.seeall)
-
-function index()
-        entry({"admin", "portconfig"}, cbi("admin/portconfig"), _("Schnittstellen"), 20)
-end
-
diff --git a/ffpb/gluon-luci-portconfig/files/usr/lib/lua/luci/model/cbi/admin/portconfig.lua b/ffpb/gluon-luci-portconfig/files/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
deleted file mode 100644
index 9c9f6ffa138c1f4e58d7e6e5e59709c0a94d7c7e..0000000000000000000000000000000000000000
--- a/ffpb/gluon-luci-portconfig/files/usr/lib/lua/luci/model/cbi/admin/portconfig.lua
+++ /dev/null
@@ -1,38 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2014 Nils Schneider <nils@nilsschneider.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-local uci = luci.model.uci.cursor()
-
-f = SimpleForm("portconfig")
-f.template = "admin/expertmode"
-f.submit = "Speichern"
-f.reset = "Zurücksetzen"
-
-s = f:section(SimpleSection, nil, nil)
-
-o = s:option(Flag, "mesh_wan", "Mesh auf dem WAN-Port aktivieren")
-o.default = uci:get_bool("network", "mesh_wan", "auto") and o.enabled or o.disabled
-o.rmempty = false
-
-function f.handle(self, state, data)
-  if state == FORM_VALID then
-    uci:set("network", "mesh_wan", "auto", data.mesh_wan)
-    uci:save("network")
-    uci:commit("network")
-  end
-  
-  return true
-end
-
-return f