diff --git a/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php b/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php
index 9bd74cb8a6..de97b19e64 100644
--- a/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php
+++ b/lib/Alchemy/Phrasea/Order/Controller/ApiOrderController.php
@@ -304,27 +304,19 @@ class ApiOrderController extends BaseOrderController
 
         // Load all subdefs
         $subdefs = $this->app['service.media_subdef']->findSubdefsFromRecordReferenceCollection($records);
-        $links = \media_Permalink_Adapter::getMany($this->app, $subdefs);
+        \media_Permalink_Adapter::getMany($this->app, $subdefs);
 
-        $orderableViews = [];
-
-        $views = array_map(null, $subdefs, $links);
-
-        foreach ($views as $view) {
-            /**
-             * @var \media_subdef $subdef
-             * @var \media_Permalink_Adapter $link
-             */
-            list ($subdef, $link) = $view;
+        $orderableSubdefs = [];
 
+        foreach ($subdefs as $subdef) {
             $databoxId = $subdef->get_sbas_id();
             $recordId = $subdef->get_record_id();
 
-            if (!isset($orderableViews[$databoxId][$recordId])) {
-                $orderableViews[$databoxId][$recordId] = [];
+            if (!isset($orderableSubdefs[$databoxId][$recordId])) {
+                $orderableSubdefs[$databoxId][$recordId] = [];
             }
 
-            $orderableViews[$databoxId][$recordId][] = new SubdefViewModel($subdef, $link);
+            $orderableSubdefs[$databoxId][$recordId][] = $subdef;
         }
 
         foreach ($models as $model) {
@@ -332,8 +324,8 @@ class ApiOrderController extends BaseOrderController
                 $databoxId = $collectionToDataboxMap[$element->getElement()->getBaseId()];
                 $recordId = $element->getElement()->getRecordId();
 
-                if (isset($orderableViews[$databoxId][$recordId])) {
-                    $element->setOrderableMediaSubdefs($orderableViews[$databoxId][$recordId]);
+                if (isset($orderableSubdefs[$databoxId][$recordId])) {
+                    $element->setOrderableMediaSubdefs($orderableSubdefs[$databoxId][$recordId]);
                 }
             }
         }
diff --git a/lib/Alchemy/Phrasea/Order/OrderElementViewModel.php b/lib/Alchemy/Phrasea/Order/OrderElementViewModel.php
index f7fe265619..9440f54a7e 100644
--- a/lib/Alchemy/Phrasea/Order/OrderElementViewModel.php
+++ b/lib/Alchemy/Phrasea/Order/OrderElementViewModel.php
@@ -66,11 +66,11 @@ class OrderElementViewModel
     }
 
     /**
-     * @param SubdefViewModel[] $subdefs
+     * @param \media_subdef[] $subdefs
      */
     public function setOrderableMediaSubdefs($subdefs)
     {
-        Assertion::allIsInstanceOf($subdefs, SubdefViewModel::class);
+        Assertion::allIsInstanceOf($subdefs, \media_subdef::class);
 
         $this->subdefs = $subdefs instanceof \Traversable ? iterator_to_array($subdefs) : $subdefs;
     }
diff --git a/lib/Alchemy/Phrasea/Order/SubdefViewModel.php b/lib/Alchemy/Phrasea/Order/SubdefViewModel.php
deleted file mode 100644
index c42840a05d..0000000000
--- a/lib/Alchemy/Phrasea/Order/SubdefViewModel.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2016 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Order;
-
-class SubdefViewModel
-{
-    /**
-     * @var \media_subdef
-     */
-    private $subdef;
-
-    /**
-     * @var \media_Permalink_Adapter
-     */
-    private $link;
-
-    public function __construct(\media_subdef $subdef, \media_Permalink_Adapter $link)
-    {
-        $this->subdef = $subdef;
-        $this->link = $link;
-    }
-
-    /**
-     * @return \media_subdef
-     */
-    public function getSubdef()
-    {
-        return $this->subdef;
-    }
-
-    /**
-     * @return \media_Permalink_Adapter
-     */
-    public function getLink()
-    {
-        return $this->link;
-    }
-}