diff --git a/composer.json b/composer.json
index 48d1ef75ee1..579026656eb 100755
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,6 @@
         "ext-zlib": "*",
         "angelfqc/vimeo-api": "2.0.6",
         "apereo/phpcas": "^1.6",
-        "brumann/polyfill-unserialize": "^1.0",
         "chamilo/pclzip": "~2.8",
         "clue/graph": "~0.9.0",
         "culqi/culqi-php": "1.3.4",
@@ -87,12 +86,13 @@
         "onelogin/php-saml": "^3.0",
         "paragonie/random-lib": "2.0.0",
         "patchwork/utf8": "~1.2",
-        "php-ffmpeg/php-ffmpeg": "0.5.1",
+        "php-ffmpeg/php-ffmpeg": "^0.5.1",
         "php-http/guzzle6-adapter": "^2.0",
         "php-xapi/client": "0.7.x-dev",
+        "php-xapi/model": "dev-master as v3.1.0",
         "php-xapi/repository-api": "dev-master as 0.3.1",
         "php-xapi/repository-doctrine": "dev-master",
-        "php-xapi/symfony-serializer": "2.1.0 as 2.0",
+        "php-xapi/symfony-serializer": "dev-master as 2.0",
         "phpmailer/phpmailer": "~6.1",
         "phpoffice/phpexcel": "~1.8",
         "phpoffice/phpword": "~0.14",
@@ -122,11 +122,7 @@
         "twig/twig": "1.*",
         "webit/eval-math": "1.0.1",
         "yuloh/bccomp-polyfill": "dev-master",
-	    "packbackbooks/lti-1p3-tool": "1.1.1.x-dev",
-        "zendframework/zend-config": "~3.0",
-        "zendframework/zend-feed": "~2.6|^3.0",
-        "zendframework/zend-http": "~2.6|^3.0",
-        "zendframework/zend-soap": "~2.6|^3.0"
+	    "packbackbooks/lti-1p3-tool": "1.1.1.x-dev"
     },
     "require-dev": {
         "behat/behat": "~3.5",
@@ -189,6 +185,16 @@
             "type": "github",
             "url": "https://github.com/AngelFQC/xapi-symfony-serializer.git",
             "no-api": true
+        },
+        {
+            "type": "github",
+            "url": "https://github.com/AngelFQC/xapi-client.git",
+            "no-api": true
+        },
+        {
+            "type": "github",
+            "url": "https://github.com/AngelFQC/xapi-repository-api.git",
+            "no-api": true
         },
 	    {
             "type": "github",
diff --git a/main/inc/lib/UnserializeApi.php b/main/inc/lib/UnserializeApi.php
index 14244c9aeef..6a87789b994 100644
--- a/main/inc/lib/UnserializeApi.php
+++ b/main/inc/lib/UnserializeApi.php
@@ -1,8 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-use Brumann\Polyfill\Unserialize;
-
 /**
  * Class UnserializeApi.
  */
@@ -109,13 +107,13 @@ public static function unserialize($type, $serialized, $ignoreErrors = false)
         }
 
         if ($ignoreErrors) {
-            return @Unserialize::unserialize(
+            return @unserialize(
                 $serialized,
                 ['allowed_classes' => $allowedClasses]
             );
         }
 
-        return Unserialize::unserialize(
+        return unserialize(
             $serialized,
             ['allowed_classes' => $allowedClasses]
         );