diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk
index 6ec1172a99ce870fd9f5bce90c45aacedcb18613..8f03eb5e99ddb95866541b55c3526848614e515b 100644
--- a/docs/site-example/site.mk
+++ b/docs/site-example/site.mk
@@ -9,7 +9,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-contact-info \
-	gluon-config-mode-core \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
@@ -22,7 +21,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
-	gluon-setup-mode \
 	gluon-status-page \
 	haveged \
 	iwinfo
diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile
index a77c07ded2b64363e8e258fe0eeca7311beb6a51..423aca18da5781c6a8f3432babf81d10e8605851 100644
--- a/package/gluon-config-mode-autoupdater/Makefile
+++ b/package/gluon-config-mode-autoupdater/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Config Mode: Let the user know whether the autoupdater is enabled or not
-  DEPENDS:=gluon-config-mode-core-virtual +gluon-autoupdater
+  DEPENDS:=+gluon-config-mode-core +gluon-autoupdater
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile
index 7a3780a66dc382ea597972fbc2baac63e0b86102..c7d11b114eb8ceb3f2be2bc136691736ac1537e2 100644
--- a/package/gluon-config-mode-contact-info/Makefile
+++ b/package/gluon-config-mode-contact-info/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-contact-info
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Allows the user to provide contact information to be distributed in the mesh
-  DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info
+  DEPENDS:=+gluon-config-mode-core +gluon-node-info
 endef
 
 define Package/gluon-config-mode-contact-info/description
diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index 91b2e51fc4d8cb09c1e15827211bdd93fb56b7ef..a66a042f0e5a1b0179c6a2f2ff9046173382f2ec 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -17,8 +17,7 @@ define Package/gluon-config-mode-core
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Configuration wizard for user friendly setup of new mesh nodes
-  DEPENDS:=gluon-setup-mode-virtual +gluon-web-theme +gluon-lock-password +pretty-hostname
-  PROVIDES:=gluon-config-mode-core-virtual
+  DEPENDS:=+gluon-setup-mode +gluon-web-theme +gluon-lock-password +pretty-hostname
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile
index af523f093da03c72175ef3ce6fa92364d63f6a36..7c938ca72422da019addd48d1df3fc4dcf501245 100644
--- a/package/gluon-config-mode-geo-location/Makefile
+++ b/package/gluon-config-mode-geo-location/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-geo-location
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Set geographic location of a node
-  DEPENDS:=gluon-config-mode-core-virtual +gluon-node-info
+  DEPENDS:=+gluon-config-mode-core +gluon-node-info
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile
index 2b24a640f1d02c92b0949da01bd4708fd5d12493..041f09d9aa4d03f34f23bd2ab808185b3cca7a94 100644
--- a/package/gluon-config-mode-hostname/Makefile
+++ b/package/gluon-config-mode-hostname/Makefile
@@ -14,7 +14,7 @@ define Package/gluon-config-mode-hostname
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Set the hostname
-  DEPENDS:=gluon-config-mode-core-virtual
+  DEPENDS:=+gluon-config-mode-core
 endef
 
 define Build/Prepare
diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile
index 20e5c0164c0bdf65a6e6421b3586777104a8d61f..ecca627d535af7b911cbfc0ca7f84662d8381ccb 100644
--- a/package/gluon-config-mode-mesh-vpn/Makefile
+++ b/package/gluon-config-mode-mesh-vpn/Makefile
@@ -14,7 +14,7 @@ define Package/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-core
+  DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core
 endef
 
 define Build/Prepare
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index 5840d3fd4105effd8ec60247c815cfe143d57059..d149e9186acffaf78e408b8c0a05d4b53f1d92ec 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -16,7 +16,6 @@ define Package/gluon-setup-mode
   CATEGORY:=Gluon
   TITLE:=Setup mode
   DEPENDS:=+gluon-core +gluon-web +ubus +uhttpd +dnsmasq
-  PROVIDES:=gluon-setup-mode-virtual
 endef
 
 define Package/gluon-setup-mode/description
diff --git a/package/gluon-web-admin/Makefile b/package/gluon-web-admin/Makefile
index e244b35b6d2f32f78cc48d1d679d1d6c538b26b3..164b0db137af65dc16326ce1eb7a2f4aea597138 100644
--- a/package/gluon-web-admin/Makefile
+++ b/package/gluon-web-admin/Makefile
@@ -18,7 +18,7 @@ define Package/gluon-web-admin
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Web-based simple administration interface for mesh nodes
-  DEPENDS:=gluon-config-mode-core-virtual +pretty-hostname
+  DEPENDS:=+gluon-config-mode-core +pretty-hostname
 endef
 
 define Build/Prepare