diff --git a/ice-client/Makefile b/ice-client/Makefile
index 225f0683d..481ef621c 100644
--- a/ice-client/Makefile
+++ b/ice-client/Makefile
@@ -1,3 +1,5 @@
+CONFIG_ICE_OPEN:=n
+
 include $(TOPDIR)/rules.mk
 
 # We use the foldername as main package name
@@ -22,22 +24,11 @@ export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
-PKG_SOURCE_VERSION:=d3065ee24d72d3fffd5ff75b617bf54fb5377561
-ifeq ($(CONFIG_ICE_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-#PKG_NAME:=ice-client-open
-else
-PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz
 PKG_SOURCE_PROTO:=git
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
-endif
-
+PKG_SOURCE_URL:=git@private.inteno.se:ice-client
+PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
 
 ###########################--RELEASE--################################
 
@@ -56,9 +47,9 @@ $(call Package/ice-client/Default)
 	DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox +libpthread
 endef
 
-define Package/ice-client/config
-	source "$(SOURCE)/Config.in"
-endef
+#define Package/ice-client/config
+#	source "$(SOURCE)/Config.in"
+#endef
 
 ###########################--DEVELOPMENT--################################
 # Development settings
diff --git a/questd/Makefile b/questd/Makefile
index 88304f45e..72274e671 100644
--- a/questd/Makefile
+++ b/questd/Makefile
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.0
 
-PKG_SOURCE_VERSION:=f7e856ec68627842c1e79eadb5b856ec629bb637
+(??)PKG_SOURCE_VERSION:=d7e9195cfda57cfe361548a3cff35273c65626f3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 
@@ -43,7 +43,6 @@ endef
 define Package/questd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_DIR) $(1)/tmp
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/
diff --git a/questd/files/tmp/igmp_snooping b/questd/files/tmp/igmp_snooping
deleted file mode 100644
index 795f34e8d..000000000
--- a/questd/files/tmp/igmp_snooping
+++ /dev/null
@@ -1,5 +0,0 @@
-igmp snooping 2  proxy 1  lan2lan-snooping 0/0, rate-limit 0pps, priority -1
-bridge device src-dev #tags lan-tci  wan-tci    group      mode RxGroup    source     reporter   timeout Index      ExcludPt
-br-lan eth5   eth2.1  00    0x0000   0xffffffff 0xe0027ffe EX   0xe0027ffe 0x00000000 0xc0a801f1 258     0x401e0001 -1
-br-lan eth5   eth2.1  00    0x0000   0xffffffff 0xefc3ffff EX   0xefc3ffff 0x00000000 0xc0a801f1 258     0x400e0001 -1
-br-lan eth5   eth2.1  00    0x0000   0xffffffff 0xefffffff EX   0xefffffff 0x00000000 0xc0a801f1 258     0x40070001 -1