diff --git a/buildscript b/buildscript
index 5488803..b704daf 100755
--- a/buildscript
+++ b/buildscript
@@ -14,7 +14,7 @@ OPENWRT=(openwrt
          svn
          svn://svn.openwrt.org/openwrt/packages
          $OPENWRTREV)
-OPENWRT_PKGS="bridge ethtool gpioctl-sysfs horst libugpio mii-tool wavemon kmod-gpiotoggling"
+OPENWRT_PKGS="bridge gpioctl-sysfs libugpio mii-tool kmod-gpiotoggling"
 
 #official openwrt routing packages
 ROUTING=(routing
@@ -22,20 +22,15 @@ ROUTING=(routing
          https://github.com/openwrt-routing/packages.git
          44318d05898069300ce2ad6eb05eb40f232e7123
          ../../../build_patches/0001-batman-adv-no-rebroadcast-option.patch)
-ROUTING_PKGS="alfred kmod-batman-adv kmod-batgat"
+ROUTING_PKGS="kmod-batman-adv"
 
 FASTD=(fastd
        git
        git://git.metameute.de/lff/pkg_fastd
        v14-1)
-FASTD_PKGS="fastd libuecc"
+FASTD_PKGS="fastd"
 
-FFOL=(ffol
-      'local'
-      ${PWD}/src/packages/ffol/)
-FFOL_PKGS="nodewatcher"
-
-FEEDS=(OPENWRT ROUTING FASTD FFOL)
+FEEDS=(OPENWRT ROUTING FASTD)
 
 checkout_svn(){
 	local DIRECTORY=$1
@@ -93,6 +88,7 @@ checkout_git(){
 }
 
 get_source() {
+	test -d src || mkdir src
 	cd src
 
 	#Get the OpenWrt Core Source for Firmware
diff --git a/src/packages/ffol/libwlocate/Makefile b/src/packages/ffol/libwlocate/Makefile
deleted file mode 100644
index 7946da3..0000000
--- a/src/packages/ffol/libwlocate/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libwlocate
-PKG_VERSION:=1.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dev.freifunk-ol.de/packages
-PKG_MD5SUM:=5f8be7c6e95b64f24dd8cde4557612a4
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libwlocate
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Shared library that can be used for location-based services
-  URL:=http://sourceforge.net/projects/libwlocate/
-  DEPENDS:=+libiw
-endef
-
-define Package/libwlocate/description
-	libwlocate is a shared library that can be used for location-based services.
-	It checks for WLAN-networks that are available near to a user and retrieves the
-	current geographic position out of them.
-	Thus no GPS is needed for positioning. This WLAN-based geolocation happens
-	without using any of the commercial services that do the same but track the users
-	position and data. libwlocate instead bases on the free OpenWLANMap project.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/libwlocate.h $(1)/usr/include/
-	
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwlocate.so $(1)/usr/lib/
-endef
-
-define Package/libwlocate/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwlocate.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libwlocate))
\ No newline at end of file
diff --git a/src/packages/ffol/lwtrace/Makefile b/src/packages/ffol/lwtrace/Makefile
deleted file mode 100644
index 90bd197..0000000
--- a/src/packages/ffol/lwtrace/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=lwtrace
-PKG_VERSION:=1.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dev.freifunk-ol.de/packages
-PKG_MD5SUM:=bbe4e339daf69efe0b6c325f799c3e0b
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/lwtrace
-  SECTION:=utilities
-  CATEGORY:=Utilities
-  TITLE:=Tool that uses the libwlocate library to get a position wireless
-  URL:=http://sourceforge.net/projects/libwlocate/
-  DEPENDS:=+libwlocate
-endef
-
-define Package/lwtrace/description
-	libwlocate is a shared library that can be used for location-based services.
-	It checks for WLAN-networks that are available near to a user and retrieves the
-	current geographic position out of them.
-	Thus no GPS is needed for positioning. This WLAN-based geolocation happens
-	without using any of the commercial services that do the same but track the users
-	position and data. libwlocate instead bases on the free OpenWLANMap project.
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/lwtrace $(1)/usr/bin/
-endef
-
-define Package/lwtrace/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/lwtrace $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,lwtrace))
\ No newline at end of file
diff --git a/src/packages/ffol/nodewatcher/Makefile b/src/packages/ffol/nodewatcher/Makefile
deleted file mode 100644
index a16a368..0000000
--- a/src/packages/ffol/nodewatcher/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=nodewatcher
-PKG_VERSION:=2013-02-13
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://freifunk-ol.de/ffol/software/nodewatcher.git
-PKG_SOURCE:=$(PKG_NAME).tar.gz
-PKG_SOURCE_VERSION:=HEAD
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/nodewatcher
-  SECTION:=utilities
-  CATEGORY:=Utilities
-  TITLE:=Freifunk Oldenburg Nodewatcher
-  URL:=http://freifunk-ol.de
-  DEPENDS:=+libuci +ip +libiw
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/nodewatcher $(1)/usr/bin/
-endef
-
-define Package/nodewatcher/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/nodewatcher $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,nodewatcher))
\ No newline at end of file