diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
index 024421386..858caf53a 100644
--- a/core/lib/Thelia/Core/Thelia.php
+++ b/core/lib/Thelia/Core/Thelia.php
@@ -25,12 +25,12 @@ class Thelia extends Kernel
      * The cached version of the service container is used when fresh, otherwise the
      * container is built.
      */
-//    protected function initializeContainer()
-//    {
-//        $this->container = $this->buildContainer();
-//        $this->container->set('kernel', $this);
-//
-//    }
+    protected function initializeContainer()
+    {
+        $this->container = $this->buildContainer();
+        $this->container->set('kernel', $this);
+
+    }
     
     /**
      * Gets the cache directory.
@@ -72,16 +72,16 @@ class Thelia extends Kernel
      *
      * @return ContainerBuilder The compiled service container
      */
-//    protected function buildContainer()
-//    {
-//        $container = $this->getContainerBuilder();
-//
-//        foreach ($this->bundles as $bundle) {
-//            $bundle->build($container);
-//        }
-//
-//        return $container;
-//    }
+    protected function buildContainer()
+    {
+        $container = $this->getContainerBuilder();
+
+        foreach ($this->bundles as $bundle) {
+            $bundle->build($container);
+        }
+
+        return $container;
+    }
 
     /**
      * return available bundle
diff --git a/propel-gen b/propel-gen
deleted file mode 120000
index 9b13ac026..000000000
--- a/propel-gen
+++ /dev/null
@@ -1 +0,0 @@
-core/vendor/propel/propel1/generator/bin/propel-gen
\ No newline at end of file