diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.catalog_keys.xml
deleted file mode 100644
index a540f9431e9c394244ed71562b197938e6fe9258..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.catalog_keys.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<catalog_method>
-</catalog_method>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml
deleted file mode 100644
index be95a4b9554546a4cb81b63562c94ae6cb38b69b..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\r\n
-table_1\r\n
-table_2\r\n
-table_3\r\n
-table_4\r\n
-table_5</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_grand_grand_grand_grand_grand_parent</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.uid = catalog.parent_uid\n
-AND <dtml-var table_1>.uid = <dtml-var table_0>.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_4>.uid = <dtml-var table_3>.parent_uid\n
-AND <dtml-var table_5>.uid = <dtml-var table_4>.parent_uid\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.catalog_keys.xml
deleted file mode 100644
index a540f9431e9c394244ed71562b197938e6fe9258..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.catalog_keys.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<catalog_method>
-</catalog_method>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml
deleted file mode 100644
index 567b8d60fe434fd917d194905de193ab15450f2a..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\r\n
-table_1\r\n
-table_2\r\n
-table_3\r\n
-table_4\r\n
-table_5</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_grand_grand_grand_grand_parent_specialise</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.specialise.getUid()">\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_4>.uid = <dtml-var table_3>.parent_uid\n
-AND <dtml-var table_0>.uid = <dtml-var table_4>.parent_uid\n
-AND <dtml-var table_5>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml
deleted file mode 100644
index a540f9431e9c394244ed71562b197938e6fe9258..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.catalog_keys.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<catalog_method>
-</catalog_method>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
deleted file mode 100644
index 227ed998db4452f3703dca51d6225a5793de0e9c..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\r\n
-table_1\r\n
-table_2\r\n
-table_3\r\n
-table_4\r\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_grand_grand_grand_parent_delivery</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_3>.parent_uid\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_3>.uid = <dtml-var table_2>.parent_uid\n
-AND <dtml-var table_4>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml
deleted file mode 100644
index a540f9431e9c394244ed71562b197938e6fe9258..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.catalog_keys.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<catalog_method>
-</catalog_method>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
deleted file mode 100644
index 203b3f8c8072dbfde17f8a1cc4244012707a70ee..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_related_grand_parent_delivery.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="SQL" module="Products.ZSQLMethods.SQL"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>allow_simple_one_argument_traversal</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>arguments_src</string> </key>
-            <value> <string>table_0\r\n
-table_1\r\n
-table_2\r\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>cache_time_</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>class_file_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>class_name_</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>connection_hook</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>z_related_grand_parent_delivery</string> </value>
-        </item>
-        <item>
-            <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
-        </item>
-        <item>
-            <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
-        </item>
-        <item>
-            <key> <string>src</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.delivery.getUid()">\n
-AND <dtml-var table_0>.uid = <dtml-var table_1>.parent_uid\n
-AND <dtml-var table_1>.uid = catalog.parent_uid\n
-AND <dtml-var table_2>.uid = <dtml-var table_0>.category_uid\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
index cd402958e84046be8c27b905580a3239cf5e3555..991b2a90f2fe4818089e0421f346df04131fbe1b 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRelatedKeyTemplateItem/related_key_list.xml
@@ -6,11 +6,6 @@
  <key>deliveryLineType | stock,catalog/portal_type/z_related_uid_or_parent_uid</key>
  <key>explanation_portal_type | stock,catalog/portal_type/z_related_explanation</key>
  <key>explanation_simulation_state | stock,catalog/simulation_state/z_related_explanation</key>
- <key>grand_grand_grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_grand_grand_parent</key>
- <key>grand_grand_grand_grand_parent_specialise_portal_type | category,catalog,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_grand_parent_specialise</key>
- <key>grand_grand_grand_grand_parent_specialise_reference | category,catalog,catalog,catalog,catalog,catalog/reference/z_related_grand_grand_grand_grand_parent_specialise</key>
- <key>grand_grand_grand_parent_delivery_portal_type | category,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_parent_delivery</key>
- <key>grand_parent_delivery_portal_type | category,catalog,catalog/portal_type/z_related_grand_parent_delivery</key>
  <key>grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent</key>
  <key>grand_parent_simulation_state | catalog,catalog/simulation_state/z_related_grand_parent</key>
  <key>item_node_category_uid | category/category_uid/z_related_node_uid_from_item</key>
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
index 1c5fd036efa9eace125dcd3660845c008a836768..99bc3d518639f3433852c803ea7199085b6616cb 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
@@ -1 +1 @@
-252
\ No newline at end of file
+253
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
index ae5823fe8b924bd357787f2fb73655eb9555a227..f9bc7e43148f9c4da77e6910d67814962b842f0d 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
@@ -88,11 +88,7 @@ erp5_mysql_innodb/z_related_children
 erp5_mysql_innodb/z_related_explanation
 erp5_mysql_innodb/z_related_function_uid_from_stock
 erp5_mysql_innodb/z_related_funding_uid_from_stock
-erp5_mysql_innodb/z_related_grand_grand_grand_grand_grand_parent
-erp5_mysql_innodb/z_related_grand_grand_grand_grand_parent_specialise
-erp5_mysql_innodb/z_related_grand_grand_grand_parent_delivery
 erp5_mysql_innodb/z_related_grand_parent
-erp5_mysql_innodb/z_related_grand_parent_delivery
 erp5_mysql_innodb/z_related_metric_type
 erp5_mysql_innodb/z_related_mirror_section_uid_from_stock
 erp5_mysql_innodb/z_related_node_uid_from_item
diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
index 4408c9aad4eda35587501ca55791bef0aebb8a73..99e63c39b495afb07f94221458ffabf592e6a5ca 100644
--- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
+++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_related_key_list
@@ -50,15 +50,10 @@ translated_causality_state | translation/translated_message/z_related_translated
 translated_causality_state_title | translation/translated_message/z_related_translated_causality_state_title
 metric_type_uid | measure/metric_type_uid/z_related_metric_type
 parent_strict_group_uid | category,catalog/uid/z_related_parent_strict_group
-grand_grand_grand_grand_grand_parent_simulation_state | catalog,catalog,catalog,catalog,catalog,catalog/simulation_state/z_related_grand_grand_grand_grand_grand_parent
 parent_specialise_reference | category,catalog/reference/z_related_parent_specialise
 predicate_category_base_category_uid | predicate_category/base_category_uid/z_related_predicate_category
 predicate_category_category_strict_membership | predicate_category/category_strict_membership/z_related_predicate_category
 predicate_category_category_uid | predicate_category/category_uid/z_related_predicate_category
-grand_parent_delivery_portal_type | category,catalog,catalog/portal_type/z_related_grand_parent_delivery
-grand_grand_grand_parent_delivery_portal_type | category,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_parent_delivery
-grand_grand_grand_grand_parent_specialise_portal_type | category,catalog,catalog,catalog,catalog,catalog/portal_type/z_related_grand_grand_grand_grand_parent_specialise
-grand_grand_grand_grand_parent_specialise_reference | category,catalog,catalog,catalog,catalog,catalog/reference/z_related_grand_grand_grand_grand_parent_specialise
 children_reference | catalog/reference/z_related_children
 related_resource_from_use_category_uid | category,category/category_uid/z_related_resource_from_use
 stock_funding_category_strict_membership_uid | category/category_uid/z_related_strict_membership_funding_uid_from_stock