diff --git a/product/ERP5/Document/DeliveryRootSimulationRule.py b/product/ERP5/Document/DeliveryRootSimulationRule.py
index 11bab13d46a646c0764bb576cc7bd12f3913ba25..41dc21e8200a590d31c613ad7274a6cdc2943660 100644
--- a/product/ERP5/Document/DeliveryRootSimulationRule.py
+++ b/product/ERP5/Document/DeliveryRootSimulationRule.py
@@ -25,10 +25,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace DeliveryRule.
-"""
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
diff --git a/product/ERP5/Document/DeliverySimulationRule.py b/product/ERP5/Document/DeliverySimulationRule.py
index 0684f0c5b2bbdc11bd0ff920b1c30584533efd7a..cb83d928cc8dcdb85e062606e946d26a4128d40a 100644
--- a/product/ERP5/Document/DeliverySimulationRule.py
+++ b/product/ERP5/Document/DeliverySimulationRule.py
@@ -25,10 +25,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace DeliveryRule.
-"""
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
diff --git a/product/ERP5/Document/InvoiceRootSimulationRule.py b/product/ERP5/Document/InvoiceRootSimulationRule.py
index 67ef5965e9af5b516bae4334d698fff6fc8f7c2a..61452d43e5e1d49dd43a892a536203d240aaba0f 100644
--- a/product/ERP5/Document/InvoiceRootSimulationRule.py
+++ b/product/ERP5/Document/InvoiceRootSimulationRule.py
@@ -26,8 +26,6 @@
 #
 ##############################################################################
 """
-XXX This file is experimental for new simulation implementation, and
-will replace InvoiceRule.
 """
 
 import zope.interface
@@ -40,8 +38,6 @@ from Products.ERP5.mixin.movement_collection_updater import \
 
 class InvoiceRootSimulationRule(RuleMixin, MovementCollectionUpdaterMixin, Predicate):
   """
-  InvoiceRule and DeliveryRule seems to be identical. Keep it for
-  compatibility only.
   """
   # CMF Type Definition
   meta_type = 'ERP5 Invoice Root Simulation Rule'
diff --git a/product/ERP5/Document/InvoiceSimulationRule.py b/product/ERP5/Document/InvoiceSimulationRule.py
index 929542d3409fb918458512dc3a698c2163115023..3cd11467b67c10c085b039f434a321233d4f3913 100644
--- a/product/ERP5/Document/InvoiceSimulationRule.py
+++ b/product/ERP5/Document/InvoiceSimulationRule.py
@@ -25,10 +25,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace InvoicingRule.
-"""
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
diff --git a/product/ERP5/Document/InvoiceTransactionSimulationRule.py b/product/ERP5/Document/InvoiceTransactionSimulationRule.py
index 9504d72115f742ace005a1de932954da0752d6e7..7182b8631b5aebffea2d5adc75cc8e162d069c7a 100644
--- a/product/ERP5/Document/InvoiceTransactionSimulationRule.py
+++ b/product/ERP5/Document/InvoiceTransactionSimulationRule.py
@@ -25,10 +25,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace InvoicingRule.
-"""
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
@@ -40,7 +36,8 @@ from Products.ERP5.mixin.movement_collection_updater import \
 from Products.ERP5.Document.PredicateMatrix import PredicateMatrix
 
 
-class InvoiceTransactionSimulationRule(RuleMixin, MovementCollectionUpdaterMixin, Predicate, PredicateMatrix):
+class InvoiceTransactionSimulationRule(RuleMixin,
+    MovementCollectionUpdaterMixin, Predicate, PredicateMatrix):
   """
   Invoice Transaction Rule object generates accounting movements for
   each invoice movement based on category membership and other
diff --git a/product/ERP5/Document/OrderRootSimulationRule.py b/product/ERP5/Document/OrderRootSimulationRule.py
index 02c47d5d733e7f4afe5f4ba7eade73d5e413a536..c6862097bedc6811a1235da694481dbbd9185946 100644
--- a/product/ERP5/Document/OrderRootSimulationRule.py
+++ b/product/ERP5/Document/OrderRootSimulationRule.py
@@ -25,10 +25,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace OrderRule.
-"""
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
diff --git a/product/ERP5/Document/PaymentSimulationRule.py b/product/ERP5/Document/PaymentSimulationRule.py
index c92c76f8a00303d3ddeed2934e9a74a6186e3728..6b3a8e1191295cc965834fef979336809972cc00 100644
--- a/product/ERP5/Document/PaymentSimulationRule.py
+++ b/product/ERP5/Document/PaymentSimulationRule.py
@@ -25,10 +25,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace PaymentRule.
-"""
 
 import zope.interface
 from AccessControl import ClassSecurityInfo
diff --git a/product/ERP5/Document/TradeModelSimulationRule.py b/product/ERP5/Document/TradeModelSimulationRule.py
index ecdb5ed565a3507e8ef1cf4267fbd9a387fc813f..771f929d3c589d7274c5c905dd1c0ebf1d63ade4 100644
--- a/product/ERP5/Document/TradeModelSimulationRule.py
+++ b/product/ERP5/Document/TradeModelSimulationRule.py
@@ -25,10 +25,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
-"""
-XXX This file is experimental for new simulation implementation, and
-will replace DeliveryRule.
-"""
+
 import zope.interface
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet, interfaces