diff --git a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/AppliedRule/last_expand_simulation_state_property.xml b/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/AppliedRule/last_expand_simulation_state_property.xml
deleted file mode 100644
index 80f35e87f2a145a7792a78f9da842989170a13fc..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/AppliedRule/last_expand_simulation_state_property.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Acquired Property" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_local_properties</string> </key>
-            <value>
-              <tuple>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_depends</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>mode</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_accessor_id</string> </key>
-            <value> <string>getLastExpandSimulationState</string> </value>
-        </item>
-        <item>
-            <key> <string>acquisition_base_category</string> </key>
-            <value>
-              <tuple>
-                <string>parent</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_copy_value</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>acquisition_depends</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_mask_value</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: (\'Applied Rule\',)</string> </value>
-        </item>
-        <item>
-            <key> <string>alt_accessor_id</string> </key>
-            <value>
-              <tuple>
-                <string>getLastExpandSimulationState</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>elementary_type/string</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>Contains the id of the simulation state when the object was last expanded (in order to avoid recalculation)</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>last_expand_simulation_state_property</string> </value>
-        </item>
-        <item>
-            <key> <string>mode</string> </key>
-            <value> <string>w</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Acquired Property</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/tests/testOrder.py b/product/ERP5/tests/testOrder.py
index 73657c2b5f86f0771d9fa91b67bb94082c4559b2..935a1401beb15b1876c3a784c161ff0e7f3fb101 100644
--- a/product/ERP5/tests/testOrder.py
+++ b/product/ERP5/tests/testOrder.py
@@ -797,8 +797,6 @@ class TestOrderMixin(SubcontentReindexingWrapper):
       applied_rule = related_applied_rule_list[0].getObject()
       sequence.edit(applied_rule=applied_rule)
       self.failUnless(applied_rule is not None)
-      self.failUnless(order_state, \
-                      applied_rule.getLastExpandSimulationState())
 
       # Test if applied rule has a specialise value with passed rule_reference
       portal_rules = getToolByName(order, 'portal_rules')
diff --git a/product/ERP5/tests/testProductionOrder.py b/product/ERP5/tests/testProductionOrder.py
index 74f07f8b5f649038c296ef678de7f063b86476a2..1dda48c23a5e67e88ce9c6e5ea3739fc4292a464 100644
--- a/product/ERP5/tests/testProductionOrder.py
+++ b/product/ERP5/tests/testProductionOrder.py
@@ -675,8 +675,6 @@ class TestProductionOrderMixin(TestOrderMixin):
       applied_rule = related_applied_rule_list[0].getObject()
       sequence.edit(applied_rule=applied_rule)
       self.failUnless(applied_rule is not None)
-      self.failUnless(order_state, \
-                      applied_rule.getLastExpandSimulationState())
       # Test if applied rule has a specialise value with default_order_rule
       # XXX hardcoded value
       self.assertEquals('default_production_order_rule', \
diff --git a/product/ERP5/tests/testProductionOrderApparel.py b/product/ERP5/tests/testProductionOrderApparel.py
index 97b2c17ee87a922b2b2c637383b019e0539e6659..cb9bb0ffd8174f4f6b876dfe4492e7f1ea7cec31 100644
--- a/product/ERP5/tests/testProductionOrderApparel.py
+++ b/product/ERP5/tests/testProductionOrderApparel.py
@@ -309,8 +309,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin):
       applied_rule = related_applied_rule_list[0].getObject()
       sequence.edit(applied_rule=applied_rule)
       self.failUnless(applied_rule is not None)
-      self.failUnless(order_state, \
-                      applied_rule.getLastExpandSimulationState())
       # Test if applied rule has a specialise value with default_order_rule
       portal_rules = getToolByName(order, 'portal_rules')
       # XXX hardcoded value
diff --git a/product/ERP5Legacy/Document/OpenOrderRule.py b/product/ERP5Legacy/Document/OpenOrderRule.py
index 8a1546020ed33d2f5d124a13fe5ce3ea614edaf4..e0904c1410acec7b408fb87444d8098a7c92a322 100644
--- a/product/ERP5Legacy/Document/OpenOrderRule.py
+++ b/product/ERP5Legacy/Document/OpenOrderRule.py
@@ -111,8 +111,6 @@ class OpenOrderRule(DeliveryRule):
             **property_dict
             )
 
-      # Mark that expand finished.
-      applied_rule.setLastExpandSimulationState(order.getSimulationState())
     # Pass to base class
     Rule.expand(self, applied_rule, force=force, **kw)
 
diff --git a/product/ERP5Legacy/tests/testLegacyOrder.py b/product/ERP5Legacy/tests/testLegacyOrder.py
index a3cd51434957d4b67bdffe2dfefd6cf1a7dc4c75..5243c3b33345d0a26003c500e51ffd1ffcb2e72c 100644
--- a/product/ERP5Legacy/tests/testLegacyOrder.py
+++ b/product/ERP5Legacy/tests/testLegacyOrder.py
@@ -804,8 +804,6 @@ class TestOrderMixin(object):
       applied_rule = related_applied_rule_list[0].getObject()
       sequence.edit(applied_rule=applied_rule)
       self.failUnless(applied_rule is not None)
-      self.failUnless(order_state, \
-                      applied_rule.getLastExpandSimulationState())
 
       # Test if applied rule has a specialise value with passed rule_reference
       portal_rules = getToolByName(order, 'portal_rules')
diff --git a/product/ERP5Legacy/tests/testLegacyProductionOrder.py b/product/ERP5Legacy/tests/testLegacyProductionOrder.py
index 84ddddb85b7c721e4ebd5714cde417d27e31e9c4..ef79853af8c3d44d3ce785067f5cbcb8f7532f8a 100644
--- a/product/ERP5Legacy/tests/testLegacyProductionOrder.py
+++ b/product/ERP5Legacy/tests/testLegacyProductionOrder.py
@@ -686,8 +686,6 @@ class TestProductionOrderMixin(TestOrderMixin):
       applied_rule = related_applied_rule_list[0].getObject()
       sequence.edit(applied_rule=applied_rule)
       self.failUnless(applied_rule is not None)
-      self.failUnless(order_state, \
-                      applied_rule.getLastExpandSimulationState())
       # Test if applied rule has a specialise value with default_order_rule
       portal_rules = getToolByName(order, 'portal_rules')
       # XXX hardcoded value