diff --git a/profiles/templates/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory b/profiles/templates/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
deleted file mode 100644
index b065f51e9..000000000
--- a/profiles/templates/2_ac_install_merge/kde-frameworks/plasma/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip mergepkg()!=&&pkg(x11-themes/calculate-icon-theme)>=14-r6
diff --git a/profiles/templates/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz b/profiles/templates/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
deleted file mode 100644
index 4c5af8eca..000000000
--- a/profiles/templates/2_ac_install_merge/kde-frameworks/plasma/remove-start.svgz
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate path=/usr/share/plasma/desktoptheme/default/icons name=start.svgz append=remove
diff --git a/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory b/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
deleted file mode 100644
index 615bc8bdf..000000000
--- a/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip merge()!=
diff --git a/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch b/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
deleted file mode 100644
index b26810375..000000000
--- a/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/screen_saver_timeout-1.2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate format=diff merge(xfce-extra/xfce4-power-manager)<1.5.2
-diff --git src/xfpm-dpms.c src/xfpm-dpms.c
-index 53f3721..6fb0947 100644
---- src/xfpm-dpms.c
-+++ src/xfpm-dpms.c
-@@ -46,6 +46,16 @@ static void xfpm_dpms_finalize   (GObject *object);
- #define XFPM_DPMS_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_DPMS, XfpmDpmsPrivate))
- 
-+static void
-+set_saver(Display *dpy, int value)
-+{
-+    int timeout, interval, prefer_blank, allow_exp;
-+
-+    XGetScreenSaver(dpy, &timeout, &interval, &prefer_blank, &allow_exp);
-+    timeout = value;
-+    XSetScreenSaver(dpy, timeout, timeout, prefer_blank, allow_exp);
-+}
-+
- struct XfpmDpmsPrivate
- {
-     XfpmXfconf      *conf;
-@@ -75,6 +85,7 @@ xfpm_dpms_set_timeouts (XfpmDpms *dpms, guint16 standby, guint16 suspend, guint
- 	DPMSSetTimeouts (GDK_DISPLAY(), standby,
- 					suspend,
- 					off );
-+	set_saver(GDK_DISPLAY(), standby);
-     }
- }
- 
diff --git a/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/wait_lid_dpms_on.patch b/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/wait_lid_dpms_on.patch
deleted file mode 100644
index 1d975215f..000000000
--- a/profiles/templates/6_ac_install_patch/xfce-extra/xfce4-power-manager/wait_lid_dpms_on.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate format=diff
-diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
-index e9acaa0..a08f42c 100644
---- a/src/xfpm-manager.c
-+++ b/src/xfpm-manager.c
-@@ -441,12 +441,9 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
-   {
-     XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
- 
--    if ( action == LID_TRIGGER_NOTHING )
--    {
--      if ( !xfpm_is_multihead_connected () )
--        xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
--    }
--    else if ( action == LID_TRIGGER_LOCK_SCREEN )
-+    if ( action != LID_TRIGGER_NOTHING && !xfpm_is_multihead_connected () )
-+      xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
-+    if ( action == LID_TRIGGER_LOCK_SCREEN )
-     {
-       if ( !xfpm_is_multihead_connected () )
-       {
-@@ -472,7 +469,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
-   else
-   {
-     XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID opened");
--
-+    g_usleep (1000000);
-     xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOn);
-   }
- }