diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 978a131b2..2ac063541 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -931,7 +931,6 @@ _e_module_whitelist_check(void)
       "xkbswitch",
       "echievements",
       "music-control",
-      "conf2",
       "appmenu",
       "packagekit",
       NULL   // end marker
diff --git a/src/modules/Makefile_conf2.mk b/src/modules/Makefile_conf2.mk
deleted file mode 100644
index c520aa34f..000000000
--- a/src/modules/Makefile_conf2.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-conf2dir = $(MDIR)/conf2
-conf2_DATA = src/modules/conf2/e-module-conf2.edj \
-	    src/modules/conf2/module.desktop
-CLEANFILES += src/modules/conf2/e-module-conf2.edj
-EXTRA_DIST += $(conf2_DATA) \
-src/modules/conf2/e-module-conf2.edc \
-src/modules/conf2/module.desktop.in \
-src/modules/conf2/images/volume_knob_ledsoff.png \
-src/modules/conf2/images/volume_knob_move.png \
-src/modules/conf2/images/volume_knob.png \
-src/modules/conf2/images/volume_led_01.png
-
-conf2pkgdir = $(MDIR)/conf2/$(MODULE_ARCH)
-conf2pkg_LTLIBRARIES = src/modules/conf2/module.la
-
-src_modules_conf2_module_la_LDFLAGS = $(MOD_LDFLAGS)
-src_modules_conf2_module_la_SOURCES = src/modules/conf2/e_mod_main.c \
-			 src/modules/conf2/e_mod_main.h \
-			 src/modules/conf2/e_conf2.c
-
-src_modules_conf2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @ELM_CFLAGS@
-src_modules_conf2_module_la_LIBADD = $(MOD_LIBS) @ELM_LIBS@
-
-CONF2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/conf2/images -id $(top_srcdir)/data/themes/img
-
-src/modules/conf2/%.edj: $(top_srcdir)/src/modules/conf2/%.edc Makefile
-	$(EDJE_CC) $(CONF2_EDJE_FLAGS) $< $@
-
-PHONIES += conf2 install-conf2
-conf2: $(conf2pkg_LTLIBRARIES) $(conf2_DATA)
-install-conf2: install-conf2DATA install-conf2pkgLTLIBRARIES
-
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index 04f40f015..abc70cf57 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -265,11 +265,6 @@ e_modapi_init(E_Module *m)
 
    conf_module = m;
 
-   if (e_action_find("configuration"))
-     {
-        e_util_dialog_show(_("Error"), _("conf module cannot be loaded when conf2 module is already loaded!"));
-        return NULL;
-     }
    /* add module supplied action */
    act = e_action_add("configuration");
    if (act)