diff --git a/product/ERP5/Document/PaymentCondition.py b/product/ERP5/Document/PaymentCondition.py
index 727229ce9bd13e6a7548cd2afde68e81bb2d4beb..3740125743da17ee4a94cf2a33cac808eb4487b4 100644
--- a/product/ERP5/Document/PaymentCondition.py
+++ b/product/ERP5/Document/PaymentCondition.py
@@ -73,9 +73,3 @@ class PaymentCondition(TradeModelLine):
       return method
     method = self._getTypeBasedMethod('calculateMovement')
     return method
-
-  def _isMatchedMovement(self, movement, base_application_list, tmp_movement):
-    """Override the original implementation and allow payment condition to
-    match to any movements
-    """
-    return True
diff --git a/product/ERP5/Document/TradeModelLine.py b/product/ERP5/Document/TradeModelLine.py
index 8582d05edff72ace4ef73e0bb7a7648923a44fae..03207428fe871c3382c90a6100be5c9e53d728c9 100644
--- a/product/ERP5/Document/TradeModelLine.py
+++ b/product/ERP5/Document/TradeModelLine.py
@@ -93,9 +93,6 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin):
     if result:
       return result
     return ('base_contribution', 'trade_phase', )
-                                     'portal_roundings').getRoundingProxy
-      movement_list = [rounding_proxy(movement, context=self)
-        'use': self.getUse(),
 
   #
   security.declareProtected(Permissions.AccessContentsInformation,
@@ -104,14 +101,3 @@ class TradeModelLine(MappedValue, XMLMatrix, Amount, AmountGeneratorMixin):
     """
     """
     return self._baseGetPrice()
-
-  def _isMatchedMovement(self, movement, base_application_list, tmp_movement):
-    return (
-      set(base_application_list).intersection(
-      set(movement.getBaseContributionList())) and
-      (len(movement.getVariationCategoryList()) == 0 or
-       len(tmp_movement.getVariationCategoryList()) == 0 or
-       set(movement.getVariationCategoryList()).intersection(
-      set(tmp_movement.getVariationCategoryList()))
-       )
-      )