diff --git a/ADSpinnaker.Makefile b/ADSpinnaker.Makefile
index b19d05751602725ed02ef7b5726dec929d076a80..0aa1956646d6d18395613f4055959e6bb9791a10 100644
--- a/ADSpinnaker.Makefile
+++ b/ADSpinnaker.Makefile
@@ -23,22 +23,6 @@
 # The following lines are mandatory, please don't change them.
 where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include $(E3_REQUIRE_TOOLS)/driver.makefile
-include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
-
-
-ifneq ($(strip $(ASYN_DEP_VERSION)),)
-asyn_VERSION=$(ASYN_DEP_VERSION)
-endif
-
-
-ifneq ($(strip $(ADCORE_DEP_VERSION)),)
-adcore_VERSION=$(ADCORE_DEP_VERSION)
-endif
-
-
-ifneq ($(strip $(ADGENICAM_DEP_VERSION)),)
-adgenicam_VERSION=$(ADGENICAM_DEP_VERSION)
-endif
 
 
 
@@ -110,9 +94,7 @@ endif # ($(SUPPORT_EXTERNAL),NO)
 SCRIPTS += $(wildcard ../iocsh/*.iocsh)
 
 
-db: 
-
-.PHONY: db 
+.PHONY: 
 
 
 USR_DBFLAGS += -I . -I ..
@@ -125,22 +107,6 @@ USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adgenicam/$(ADGENICAM_DEP_VERSION)/db
 SUBS=$(wildcard $(APPDB)/*.substitutions)
 TMPS=$(wildcard $(APPDB)/*.template)
 
-db: $(SUBS) $(TMPS)
-
-$(SUBS):
-	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db -S $@  > $(basename $(@)).db.d
-	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db -S $@
-
-$(TMPS):
-	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@  > $(basename $(@)).db.d
-	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db $@
-
-
-.PHONY: db $(SUBS) $(TMPS)
 
 vlibs: $(VENDOR_LIBS)
 
diff --git a/configure/CONFIG b/configure/CONFIG
index 2b63d799534642f6668381add1905aa03dce47c7..8772be7505d5eb1af55d86c2f74542cbffe5e1e6 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -14,7 +14,7 @@ include $(TOP)/configure/CONFIG_MODULE
 endif
 
 E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
-REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure
 
-include $(REQUIRE_CONFIG)/CONFIG
+
+include $(E3_REQUIRE_LOCATION)/configure/CONFIG
 
diff --git a/configure/RULES b/configure/RULES
index e959c2fbd59fefff38d626e91a23357a51654507..8599f4d218113317b84f5f7f8bb09fd4ee564f18 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -1,6 +1,6 @@
 
-include $(REQUIRE_CONFIG)/RULES_SITEMODS
-#include $(REQUIRE_CONFIG)/RULES_EPICS
+include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS
+#include $(E3_REQUIRE_CONFIG)/RULES_EPICS
 
 include $(TOP)/configure/module/RULES_MODULE
 -include $(TOP)/configure/module/RULES_DKMS_L
diff --git a/configure/module/RULES_MODULE b/configure/module/RULES_MODULE
index 775070accd507814d0bfde6634d8ab238a7703e1..6487123041f2037fde6e14d479384b201dfd3ba0 100644
--- a/configure/module/RULES_MODULE
+++ b/configure/module/RULES_MODULE
@@ -1,8 +1,5 @@
 #
-.PHONY: db hdrs
-
-db: conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) db
+.PHONY: hdrs
 
 hdrs:
 #	$(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv