diff --git a/product/ERP5/Document/AppliedRule.py b/product/ERP5/Document/AppliedRule.py
index b8549b033d12da6e6aefcb6101174652538ba06f..2820f635d1e50adaef36e289b55fab49694bb46c 100644
--- a/product/ERP5/Document/AppliedRule.py
+++ b/product/ERP5/Document/AppliedRule.py
@@ -175,14 +175,6 @@ class AppliedRule(XMLObject):
       """
       return self.getSpecialiseValue().getDivergenceList(sim_mvt)
 
-    security.declareProtected(Permissions.AccessContentsInformation,
-        'getSolverList')
-    def getSolverList(self, movement):
-      """
-      Returns a list Divergence solvers
-      """
-      return self.getSpecialiseValue().getSolverList(movement)
-
     security.declareProtected(Permissions.AccessContentsInformation,
         'isRootAppliedRule')
     def isRootAppliedRule(self):
diff --git a/product/ERP5/Document/Rule.py b/product/ERP5/Document/Rule.py
index 50726f4a7ebbf4dc71eb19ed15ea3d98d33a3096..f3c7279f17a4d69fc8b9a8414f0470b28db7e03c 100644
--- a/product/ERP5/Document/Rule.py
+++ b/product/ERP5/Document/Rule.py
@@ -222,15 +222,6 @@ class Rule(Predicate, XMLObject):
         result_list.append(result)
     return result_list
 
-  # XXX getSolverList is not part of the API and should be removed.
-  # Use getDivergenceList instead.
-#    security.declareProtected(Permissions.View, 'getSolverList')
-
-#    def getSolverList(self, applied_rule):
-#      """
-#        Returns a list Divergence solvers
-#      """
-
   # Deliverability / orderability
   def isOrderable(self, movement):
     return 0
diff --git a/product/ERP5/Document/SimulationMovement.py b/product/ERP5/Document/SimulationMovement.py
index 8069009a855fe97630dcd5d9fb736f83cdbdfc72..c8ea2639160680e12a5e01a68e91b2e525adf2bf 100644
--- a/product/ERP5/Document/SimulationMovement.py
+++ b/product/ERP5/Document/SimulationMovement.py
@@ -436,14 +436,6 @@ class SimulationMovement(Movement, PropertyRecordableMixin):
     """
     return self.getParentValue().getDivergenceList(self)
 
-  security.declareProtected( Permissions.AccessContentsInformation,
-      'getSolverList')
-  def getSolverList(self):
-    """
-    Returns solvers that can fix the current divergence
-    """
-    return self.getParentValue().getSolverList(self)
-
   security.declareProtected( Permissions.ModifyPortalContent,
                              'setDefaultDeliveryProperties')
   def setDefaultDeliveryProperties(self):
diff --git a/product/ERP5/PropertySheet/Simulation.py b/product/ERP5/PropertySheet/Simulation.py
index c64ddf8208e873cf08c4412da1ec9dbaa1f8b552..7dae82408bc6d7cacafcea77f567f4525f51378f 100644
--- a/product/ERP5/PropertySheet/Simulation.py
+++ b/product/ERP5/PropertySheet/Simulation.py
@@ -76,5 +76,5 @@ class Simulation:
             'mode'        : 'w' },
   )
 
-  _categories = ('order', 'delivery', 'delivery_mode', 'incoterm')
+  _categories = ('order', 'delivery', 'delivery_mode', 'incoterm', 'solver')