diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
index 0a8a959..27ba989 100644
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.remerge)<100
+# Calculate append=skip ini(overlay-distros.remerge)<20160101
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99 b/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99
deleted file mode 100644
index bf1bb21..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/10-old/99
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate format=samba name=ini.env ini(overlay-distros.remerge)<#-cut()-#
-
-[overlay-distros]
-remerge = 20160101
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
index 3bc2f48..a380eff 100644
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2016/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.remerge)==20160101,20170101
+# Calculate append=skip ini(overlay-distros.remerge)<20170101
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory
index 68d750b..f761ab8 100644
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.revision)<10
+# Calculate append=skip ini(overlay-distros.revision)<20160101
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9 b/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9
deleted file mode 100644
index dfe8266..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/revision/10-old/9
+++ /dev/null
@@ -1,4 +0,0 @@
-# Calculate path=/var/lib/calculate name=ini.env format=samba ini(overlay-distros.revision)<#-cut()-#
-
-[overlay-distros]
-revision = 20160101
diff --git a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory
index f294955..1f506c2 100644
--- a/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/2016/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.revision)==20160101,20170101
+# Calculate append=skip ini(overlay-distros.revision)<20170101
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
index bde8a5c..86029cf 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.world)<300
+# Calculate append=skip ini(overlay-distros.world)<20160101
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299
deleted file mode 100644
index 1627ef8..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/299
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<299
-
-#-ini(overlay-distros.world,20160101)-#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory
index 12d2fa4..b938c51 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.world)==20160101,20170101
+# Calculate append=skip ini(overlay-distros.world)<20170101