diff --git a/plone/app/controlpanel/configure.zcml b/plone/app/controlpanel/configure.zcml
index 33655e4..92d61a5 100644
--- a/plone/app/controlpanel/configure.zcml
+++ b/plone/app/controlpanel/configure.zcml
@@ -26,7 +26,7 @@
 
   <!--<adapter factory=".search.SearchControlPanelAdapter" />-->
 
-  <adapter factory=".security.SecurityControlPanelAdapter" />
+  <!--<adapter factory=".security.SecurityControlPanelAdapter" />-->
 
   <!--<adapter factory=".site.SiteControlPanelAdapter" />-->
 
@@ -110,12 +110,14 @@
       />
   -->
 
+  <!--
   <browser:page
       name="security-controlpanel"
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       class=".security.SecurityControlPanel"
       permission="plone.app.controlpanel.Security"
       />
+   -->
 
   <!--
   <browser:page
@@ -204,6 +206,7 @@
   <subscriber
       handler=".events.handleConfigurationChangedEvent" />
 
+  <!--
   <browser:page
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       name="migrate-to-emaillogin"
@@ -211,6 +214,7 @@
       template="emaillogin.pt"
       permission="cmf.ManagePortal"
       />
+  -->
 
   <browser:page
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"