diff --git a/subgraph.template.yaml b/subgraph.template.yaml
index f0472e2b..1c6fe664 100644
--- a/subgraph.template.yaml
+++ b/subgraph.template.yaml
@@ -316,9 +316,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -337,9 +334,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_2
     kind: ethereum/contract
@@ -380,9 +374,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -401,9 +392,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_3
     kind: ethereum/contract
@@ -444,9 +432,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -465,9 +450,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_4
     kind: ethereum/contract
@@ -508,9 +490,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -529,9 +508,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_5
     kind: ethereum/contract
@@ -572,9 +548,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -593,9 +566,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_6
     kind: ethereum/contract
@@ -636,9 +606,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -657,9 +624,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_7
     kind: ethereum/contract
@@ -700,9 +664,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -721,9 +682,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_8
     kind: ethereum/contract
@@ -764,9 +722,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -785,9 +740,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_9
     kind: ethereum/contract
@@ -828,9 +780,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -849,9 +798,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_10
     kind: ethereum/contract
@@ -892,9 +838,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -913,9 +856,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_11
     kind: ethereum/contract
@@ -956,9 +896,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -977,9 +914,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_12
     kind: ethereum/contract
@@ -1020,9 +954,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1041,9 +972,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_13
     kind: ethereum/contract
@@ -1084,9 +1012,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1105,9 +1030,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_14
     kind: ethereum/contract
@@ -1148,9 +1070,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1169,9 +1088,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_15
     kind: ethereum/contract
@@ -1212,9 +1128,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1233,9 +1146,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_16
     kind: ethereum/contract
@@ -1276,9 +1186,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1297,9 +1204,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_17
     kind: ethereum/contract
@@ -1340,9 +1244,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1361,9 +1262,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_18
     kind: ethereum/contract
@@ -1404,9 +1302,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1425,9 +1320,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_19
     kind: ethereum/contract
@@ -1468,9 +1360,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1489,9 +1378,6 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
 
   - name: ERC20Template3_20
     kind: ethereum/contract
@@ -1532,9 +1418,6 @@ dataSources:
         - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
           handler: handleOrderStarted
           receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
         - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
           handler: handleNewPaymentCollector
         - event: PublishMarketFee(indexed address,indexed address,uint256)
@@ -1553,6 +1436,3 @@ dataSources:
           handler: handleRemovedPaymentManager
         - event: CleanedPermissions(indexed address,uint256,uint256)
           handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true