diff --git a/core/lib/Thelia/Action/Document.php b/core/lib/Thelia/Action/Document.php
index 35dc3e540..0e3b4a854 100644
--- a/core/lib/Thelia/Action/Document.php
+++ b/core/lib/Thelia/Action/Document.php
@@ -144,7 +144,7 @@ class Document extends BaseCachedFile implements EventSubscriberInterface
      */
     public function saveDocument(DocumentCreateOrUpdateEvent $event)
     {
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $model = $event->getModelDocument();
 
         $nbModifiedLines = $model->save();
@@ -180,7 +180,7 @@ class Document extends BaseCachedFile implements EventSubscriberInterface
             $event->getModelDocument()->setTitle($event->getUploadedFile()->getClientOriginalName());
         }
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         // Copy and save file
         if ($event->getUploadedFile()) {
             // Remove old picture file from file storage
@@ -211,7 +211,7 @@ class Document extends BaseCachedFile implements EventSubscriberInterface
      */
     public function deleteDocument(DocumentDeleteEvent $event)
     {
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
 
         $fileManager->deleteFile($event->getDocumentToDelete(), $event->getDocumentType(), FileManager::FILE_TYPE_DOCUMENTS);
     }
diff --git a/core/lib/Thelia/Action/Image.php b/core/lib/Thelia/Action/Image.php
index e5beb2823..7272f9579 100644
--- a/core/lib/Thelia/Action/Image.php
+++ b/core/lib/Thelia/Action/Image.php
@@ -255,7 +255,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
      */
     public function saveImage(ImageCreateOrUpdateEvent $event)
     {
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $model = $event->getModelImage();
 
         $nbModifiedLines = $model->save();
@@ -286,7 +286,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
      */
     public function updateImage(ImageCreateOrUpdateEvent $event)
     {
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         // Copy and save file
         if ($event->getUploadedFile()) {
             // Remove old picture file from file storage
@@ -317,7 +317,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface
      */
     public function deleteImage(ImageDeleteEvent $event)
     {
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
 
         $fileManager->deleteFile($event->getImageToDelete(), $event->getImageType(), FileManager::FILE_TYPE_IMAGES);
     }
diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index c64e606a8..8f1f50531 100644
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -6,6 +6,14 @@
 
     <services>
 
+        <service id="thelia.action.address" class="Thelia\Action\Address">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.administrator" class="Thelia\Action\Administrator">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
         <service id="thelia.action.cart" class="Thelia\Action\Cart">
             <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
@@ -21,10 +29,6 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.address" class="Thelia\Action\Address">
-            <tag name="kernel.event_subscriber"/>
-        </service>
-
         <service id="thelia.action.image" class="Thelia\Action\Image">
             <argument type="service" id="service_container"/>
              <tag name="kernel.event_subscriber"/>
@@ -154,10 +158,6 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.administrator" class="Thelia\Action\Administrator">
-            <tag name="kernel.event_subscriber"/>
-        </service>
-
         <service id="thelia.action.mailing_system" class="Thelia\Action\MailingSystem">
             <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php
index f123bfb94..95936df28 100644
--- a/core/lib/Thelia/Controller/Admin/FileController.php
+++ b/core/lib/Thelia/Controller/Admin/FileController.php
@@ -81,7 +81,7 @@ class FileController extends BaseAdminController
                 /** @var UploadedFile $fileBeingUploaded */
                 $fileBeingUploaded = $this->getRequest()->files->get('file');
 
-                $fileManager = new FileManager($this->container);
+                $fileManager = new FileManager();
 
                 // Validate if file is too big
                 if ($fileBeingUploaded->getError() == 1) {
@@ -171,7 +171,7 @@ class FileController extends BaseAdminController
                 /** @var UploadedFile $fileBeingUploaded */
                 $fileBeingUploaded = $this->getRequest()->files->get('file');
 
-                $fileManager = new FileManager($this->container);
+                $fileManager = new FileManager();
 
                 // Validate if file is too big
                 if ($fileBeingUploaded->getError() == 1) {
@@ -312,7 +312,7 @@ class FileController extends BaseAdminController
             return $response;
         }
         try {
-            $fileManager = new FileManager($this->container);
+            $fileManager = new FileManager();
             $image = $fileManager->getImageModelQuery($parentType)->findPk($imageId);
             $redirectUrl = $fileManager->getRedirectionUrl($parentType, $image->getParentId(), FileManager::FILE_TYPE_IMAGES);
 
@@ -341,7 +341,7 @@ class FileController extends BaseAdminController
             return $response;
         }
         try {
-            $fileManager = new FileManager($this->container);
+            $fileManager = new FileManager();
             $document = $fileManager->getDocumentModelQuery($parentType)->findPk($documentId);
             $redirectUrl = $fileManager->getRedirectionUrl($parentType, $document->getParentId(), FileManager::FILE_TYPE_DOCUMENTS);
 
@@ -372,7 +372,7 @@ class FileController extends BaseAdminController
 
         $message = false;
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $imageModification = $fileManager->getImageForm($parentType, $this->getRequest());
 
         try {
@@ -449,7 +449,7 @@ class FileController extends BaseAdminController
 
         $message = false;
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $documentModification = $fileManager->getDocumentForm($parentType, $this->getRequest());
 
         try {
@@ -525,7 +525,7 @@ class FileController extends BaseAdminController
         $this->checkAuth(AdminResources::retrieve($parentType), array(), AccessManager::UPDATE);
         $this->checkXmlHttpRequest();
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $imageModelQuery = $fileManager->getImageModelQuery($parentType);
         $model = $imageModelQuery->findPk($imageId);
 
@@ -606,7 +606,7 @@ class FileController extends BaseAdminController
         $this->checkAuth(AdminResources::retrieve($parentType), array(), AccessManager::UPDATE);
         $this->checkXmlHttpRequest();
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $imageModelQuery = $fileManager->getImageModelQuery($parentType);
         $model = $imageModelQuery->findPk($imageId);
 
@@ -660,7 +660,7 @@ class FileController extends BaseAdminController
         $this->checkAuth(AdminResources::retrieve($parentType), array(), AccessManager::UPDATE);
         $this->checkXmlHttpRequest();
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $documentModelQuery = $fileManager->getDocumentModelQuery($parentType);
         $model = $documentModelQuery->findPk($documentId);
 
@@ -717,7 +717,7 @@ class FileController extends BaseAdminController
         $this->checkAuth(AdminResources::retrieve($parentType), array(), AccessManager::UPDATE);
         $this->checkXmlHttpRequest();
 
-        $fileManager = new FileManager($this->container);
+        $fileManager = new FileManager();
         $documentModelQuery = $fileManager->getDocumentModelQuery($parentType);
         $model = $documentModelQuery->findPk($documentId);
 
diff --git a/core/lib/Thelia/Tests/Tools/FileManagerTest.php b/core/lib/Thelia/Tests/Tools/FileManagerTest.php
index ea8588b19..0c0f0e4e7 100644
--- a/core/lib/Thelia/Tests/Tools/FileManagerTest.php
+++ b/core/lib/Thelia/Tests/Tools/FileManagerTest.php
@@ -202,7 +202,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new ImageCreateOrUpdateEvent(FileManager::TYPE_PRODUCT, 24);
 
@@ -231,7 +231,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new DocumentCreateOrUpdateEvent(FileManager::TYPE_PRODUCT, 24);
 
@@ -260,7 +260,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new ImageCreateOrUpdateEvent(FileManager::TYPE_CATEGORY, 24);
 
@@ -289,7 +289,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new DocumentCreateOrUpdateEvent(FileManager::TYPE_CATEGORY, 24);
 
@@ -318,7 +318,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new ImageCreateOrUpdateEvent(FileManager::TYPE_FOLDER, 24);
 
@@ -347,7 +347,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new DocumentCreateOrUpdateEvent(FileManager::TYPE_FOLDER, 24);
 
@@ -376,7 +376,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new ImageCreateOrUpdateEvent(FileManager::TYPE_CONTENT, 24);
 
@@ -405,7 +405,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getFile')
             ->will($this->returnValue('file'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $event = new DocumentCreateOrUpdateEvent(FileManager::TYPE_CONTENT, 24);
 
@@ -424,7 +424,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
         $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $stubProductImage = $this->getMockBuilder('\Thelia\Model\ProductImage')
             ->disableOriginalConstructor()
@@ -450,7 +450,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
         $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $stubProductDocument = $this->getMockBuilder('\Thelia\Model\ProductDocument')
             ->disableOriginalConstructor()
@@ -476,7 +476,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
         $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $stubProductImage = $this->getMockBuilder('\Thelia\Model\ProductImage')
             ->disableOriginalConstructor()
@@ -502,7 +502,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
         $stubContainer = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $stubProductDocument = $this->getMockBuilder('\Thelia\Model\ProductDocument')
             ->disableOriginalConstructor()
@@ -528,7 +528,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
         $badFileName = 'a/ze\érà~çè§^"$*+-_°)(&é<>@#ty2/[\/:*?"<>|]/fi?.fUPPERile.exel../e*';
 
         $expected = 'azer-_ty2fi.fupperile.exel..e';
@@ -546,7 +546,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
         $actual = $fileManager->getImageModel(FileManager::TYPE_PRODUCT);
         $this->assertInstanceOf('\Thelia\Model\ProductImage', $actual);
         $actual = $fileManager->getImageModel(FileManager::TYPE_CATEGORY);
@@ -568,7 +568,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
         $actual = $fileManager->getDocumentModel(FileManager::TYPE_PRODUCT);
         $this->assertInstanceOf('\Thelia\Model\ProductDocument', $actual);
         $actual = $fileManager->getDocumentModel(FileManager::TYPE_CATEGORY);
@@ -590,7 +590,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
         $actual = $fileManager->getImageModelQuery(FileManager::TYPE_PRODUCT);
         $this->assertInstanceOf('\Thelia\Model\ProductImageQuery', $actual);
         $actual = $fileManager->getImageModelQuery(FileManager::TYPE_CATEGORY);
@@ -612,7 +612,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
         $actual = $fileManager->getDocumentModelQuery(FileManager::TYPE_PRODUCT);
         $this->assertInstanceOf('\Thelia\Model\ProductDocumentQuery', $actual);
         $actual = $fileManager->getDocumentModelQuery(FileManager::TYPE_CATEGORY);
@@ -634,7 +634,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
         $actual = $fileManager->getParentFileModel(FileManager::TYPE_PRODUCT, ProductQuery::create()->findOne()->getId());
         $this->assertInstanceOf('\Thelia\Model\Product', $actual);
         $actual = $fileManager->getParentFileModel(FileManager::TYPE_CATEGORY, CategoryQuery::create()->findOne()->getId());
@@ -677,7 +677,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $actual = $fileManager->getUploadDir(FileManager::TYPE_PRODUCT, FileManager::FILE_TYPE_IMAGES);
         $this->assertEquals(THELIA_LOCAL_DIR . 'media/images/product', $actual);
@@ -714,7 +714,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $actual = $fileManager->getRedirectionUrl(FileManager::TYPE_PRODUCT, 1, FileManager::FILE_TYPE_IMAGES);
         $this->assertEquals('/admin/products/update?product_id=1&current_tab=images', $actual);
@@ -751,7 +751,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $actual = $fileManager->getFormId(FileManager::TYPE_PRODUCT, FileManager::FILE_TYPE_IMAGES);
         $this->assertEquals('thelia.admin.product.image.modification', $actual);
@@ -795,7 +795,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getClientOriginalName')
             ->will($this->returnValue('or1-g_n?al*/&é"filen@me#'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $expected = 'or1-g_nalfilenme-1.yml';
         $actual = $fileManager->renameFile(1, $stubUploadedFile);
@@ -822,7 +822,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->method('getClientOriginalName')
             ->will($this->returnValue('or1-g_n?al*/&é"filen@me#'));
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $expected = 'or1-g_nalfilenme-1';
         $actual = $fileManager->renameFile(1, $stubUploadedFile);
@@ -839,7 +839,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fileManager = new FileManager($stubContainer);
+        $fileManager = new FileManager();
 
         $actual = $fileManager->isImage('image/jpeg');
         $this->assertTrue($actual);
diff --git a/core/lib/Thelia/Tools/FileManager.php b/core/lib/Thelia/Tools/FileManager.php
index 53d63ce22..89365c49e 100644
--- a/core/lib/Thelia/Tools/FileManager.php
+++ b/core/lib/Thelia/Tools/FileManager.php
@@ -81,23 +81,6 @@ class FileManager
     CONST FILE_TYPE_IMAGES   = 'images';
     CONST FILE_TYPE_DOCUMENTS   = 'documents';
 
-    /** @var ContainerInterface Service Container */
-    protected $container = null;
-
-    /** @var Translator Service Translator */
-    protected $translator = null;
-
-    /**
-     * Constructor
-     *
-     * @param ContainerInterface $container Service container
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-        $this->translator = $this->container->get('thelia.translator');
-    }
-
     /**
      * Copy UploadedFile into the server storage directory
      *