diff --git a/payment/uc_payment/lib/Drupal/uc_payment/Plugin/PaymentMethodManager.php b/payment/uc_payment/lib/Drupal/uc_payment/Plugin/PaymentMethodManager.php
index 08aad10..ed770d9 100644
--- a/payment/uc_payment/lib/Drupal/uc_payment/Plugin/PaymentMethodManager.php
+++ b/payment/uc_payment/lib/Drupal/uc_payment/Plugin/PaymentMethodManager.php
@@ -43,6 +43,17 @@ class PaymentMethodManager extends DefaultPluginManager {
   }
 
   /**
+   * {@inheritdoc}
+   */
+  public function getDefinitions() {
+    $methods = parent::getDefinitions();
+
+    uasort($methods, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
+
+    return $methods;
+  }
+
+  /**
    * Overrides \Drupal\Component\Plugin\PluginManagerBase::processDefinition().
    */
   public function processDefinition(&$definition, $plugin_id) {
diff --git a/payment/uc_payment/uc_payment.module b/payment/uc_payment/uc_payment.module
index 837c7f1..3ff3e6e 100644
--- a/payment/uc_payment/uc_payment.module
+++ b/payment/uc_payment/uc_payment.module
@@ -452,9 +452,7 @@ function uc_payment_load_payments($order_id) {
  *   An array of payment method definitions, keyed by method ID.
  */
 function uc_payment_method_list() {
-  $methods = Drupal::service('plugin.manager.uc_payment.method')->getDefinitions();
-  uasort($methods, 'uc_weight_sort');
-  return $methods;
+  return \Drupal::service('plugin.manager.uc_payment.method')->getDefinitions();
 }
 
 /**
diff --git a/uc_cart/lib/Drupal/uc_cart/Plugin/CheckoutPaneManager.php b/uc_cart/lib/Drupal/uc_cart/Plugin/CheckoutPaneManager.php
index 22b1367..c0613a9 100644
--- a/uc_cart/lib/Drupal/uc_cart/Plugin/CheckoutPaneManager.php
+++ b/uc_cart/lib/Drupal/uc_cart/Plugin/CheckoutPaneManager.php
@@ -89,7 +89,7 @@ class CheckoutPaneManager extends DefaultPluginManager {
       }
     }
 
-    uasort($panes, 'uc_weight_sort');
+    uasort($panes, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
 
     return $panes;
   }
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index 3853e77..46535c6 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -962,7 +962,7 @@ function template_preprocess_uc_order_invoice_page(&$variables) {
  */
 function uc_order_state_options_list() {
   $states = \Drupal::moduleHandler()->invokeAll('uc_order_state');
-  uasort($states, 'uc_weight_sort');
+  uasort($states, 'Drupal\Component\Utility\SortArray::sortByWeightElement');
 
   $options = array();
   foreach ($states as $id => $state) {