diff --git a/core/bootstrap.php b/core/bootstrap.php
index 6adb68327..7578ec1de 100644
--- a/core/bootstrap.php
+++ b/core/bootstrap.php
@@ -21,7 +21,6 @@ if (!file_exists(THELIA_CONF_DIR . 'database.yml') && !defined('THELIA_INSTALL_M
         define('THELIA_INSTALL_MODE', true);
     } else {
         $request = \Thelia\Core\HttpFoundation\Request::createFromGlobals();
-        header('location: '.$request->getUriForPath() . '/install');
-        exit;
+        header('location: '.$request->getUriForPath('/install'));
     }
 }
diff --git a/core/lib/Thelia/Command/GenerateResources.php b/core/lib/Thelia/Command/GenerateResources.php
index 3e67a0d42..29a8b4acd 100644
--- a/core/lib/Thelia/Command/GenerateResources.php
+++ b/core/lib/Thelia/Command/GenerateResources.php
@@ -61,8 +61,7 @@ class GenerateResources extends ContainerAwareCommand
         $constants = $class->getConstants();
 
         if (count($constants) == 0) {
-            $output->writeln('No resources found');
-            exit;
+            throw new \RuntimeException('No resources found');
         }
 
         switch ($input->getOption("output")) {
diff --git a/core/lib/Thelia/Command/Install.php b/core/lib/Thelia/Command/Install.php
index e3b4e981a..d1a83c215 100644
--- a/core/lib/Thelia/Command/Install.php
+++ b/core/lib/Thelia/Command/Install.php
@@ -163,11 +163,7 @@ class Install extends ContainerAwareCommand
         }
 
         if (false === $isValid) {
-            $output->writeln(array(
-                "",
-                "<error>Please put correct permissions and reload install process</error>"
-            ));
-            exit;
+            throw new \RuntimeException('Please put correct permissions and reload install process');
         }
     }
 
diff --git a/core/lib/Thelia/Controller/Admin/AbstractCrudController.php b/core/lib/Thelia/Controller/Admin/AbstractCrudController.php
index 722547b17..eeafe6a6c 100644
--- a/core/lib/Thelia/Controller/Admin/AbstractCrudController.php
+++ b/core/lib/Thelia/Controller/Admin/AbstractCrudController.php
@@ -449,7 +449,6 @@ abstract class AbstractCrudController extends BaseAdminController
     /**
      * Update object position (only for objects whichsupport that)
      *
-     * FIXME: integrate with genericUpdatePositionAction
      */
     public function updatePositionAction()
     {
diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php
index 6a0e30984..b896e9a7b 100644
--- a/core/lib/Thelia/Controller/Admin/SessionController.php
+++ b/core/lib/Thelia/Controller/Admin/SessionController.php
@@ -122,7 +122,7 @@ class SessionController extends BaseAdminController
             $this->applyUserLocale($user);
 
             /**
-             * FIXME: we have tou find a way to send cookie
+             * we have tou find a way to send cookie
              */
             if (intval($adminLoginForm->getForm()->get('remember_me')->getData()) > 0) {
                 // If a remember me field if present and set in the form, create
diff --git a/core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php b/core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
index e42fa7644..f7b85c128 100644
--- a/core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
+++ b/core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
@@ -171,16 +171,6 @@ class AsseticAssetManager implements AssetManagerInterface
 
             $fs = new Filesystem();
 
-            // FIXME: locking or not locking ?
-            /*
-                        $lock_file = "$web_assets_directory_base/assets-".md5($source_assets_directory)."-generation-lock.txt";
-
-                        if (! $fp = fopen($lock_file, "w")) {
-                            throw new IOException(sprintf('Failed to open lock file %s', $lock_file));
-                        }
-
-                        if (flock($fp, LOCK_EX|LOCK_NB)) { // do an exclusive lock
-            */
             $tmp_dir = "$to_directory.tmp";
 
             $fs->remove($tmp_dir);
diff --git a/core/lib/Thelia/Core/Template/Loop/Feed.php b/core/lib/Thelia/Core/Template/Loop/Feed.php
index 0fc5ab686..90a6ffa41 100644
--- a/core/lib/Thelia/Core/Template/Loop/Feed.php
+++ b/core/lib/Thelia/Core/Template/Loop/Feed.php
@@ -82,7 +82,7 @@ class Feed extends BaseLoop  implements ArraySearchLoopInterface
                 ->set("TITLE"       , $item->get_title())
                 ->set("AUTHOR"      , $item->get_author())
                 ->set("DESCRIPTION" , $item->get_description())
-                ->set("DATE"        , $item->get_date('U')) // FIXME - date format should be an intl parameter
+                ->set("DATE"        , $item->get_date('U'))
             ;
 
             $loopResult->addRow($loopResultRow);
diff --git a/core/lib/Thelia/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php
index 17f60b3f0..64577bfcb 100644
--- a/core/lib/Thelia/Core/TheliaHttpKernel.php
+++ b/core/lib/Thelia/Core/TheliaHttpKernel.php
@@ -188,7 +188,6 @@ class TheliaHttpKernel extends HttpKernel
                     // TODO : search if http status 302 is the good one.
                     $redirect = new RedirectResponse($lang->getUrl(), 302);
                     $redirect->send();
-                    exit;
                 } else {
                     //the user is actually on the good domain, nothing to change
                     return null;
diff --git a/core/lib/Thelia/Form/AttributeModificationForm.php b/core/lib/Thelia/Form/AttributeModificationForm.php
index 51d4f6c3a..cd6ea2a76 100644
--- a/core/lib/Thelia/Form/AttributeModificationForm.php
+++ b/core/lib/Thelia/Form/AttributeModificationForm.php
@@ -39,12 +39,6 @@ class AttributeModificationForm extends AttributeCreationForm
                         )
                     )
             ))
-/* FIXME: doesn't work
-            ->add('attribute_values', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
         ;
 
         // Add standard description fields
diff --git a/core/lib/Thelia/Form/FeatureModificationForm.php b/core/lib/Thelia/Form/FeatureModificationForm.php
index 576db4bfc..5b20bd337 100644
--- a/core/lib/Thelia/Form/FeatureModificationForm.php
+++ b/core/lib/Thelia/Form/FeatureModificationForm.php
@@ -39,13 +39,7 @@ class FeatureModificationForm extends FeatureCreationForm
                         )
                     )
             ))
-/* FIXME: doesn't work
-            ->add('feature_values', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
-        ;
+     ;
 
         // Add standard description fields
         $this->addStandardDescFields();
diff --git a/core/lib/Thelia/Form/TemplateModificationForm.php b/core/lib/Thelia/Form/TemplateModificationForm.php
index 7d4248143..96e681350 100644
--- a/core/lib/Thelia/Form/TemplateModificationForm.php
+++ b/core/lib/Thelia/Form/TemplateModificationForm.php
@@ -41,18 +41,6 @@ class TemplateModificationForm extends TemplateCreationForm
                         )
                     )
             ))
-/*
-            ->add('attributes', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
-/* FIXME: doesn't work
-            ->add('features', 'collection', array(
-                    'type'   => 'text',
-                    'options'  => array('required'  => false)
-            ))
-*/
             ;
     }
 
diff --git a/core/lib/Thelia/Tools/MoneyFormat.php b/core/lib/Thelia/Tools/MoneyFormat.php
index bf5200831..11d3136d8 100644
--- a/core/lib/Thelia/Tools/MoneyFormat.php
+++ b/core/lib/Thelia/Tools/MoneyFormat.php
@@ -49,7 +49,6 @@ class MoneyFormat extends NumberFormat
         $number = parent::format($number, $decimals, $decPoint, $thousandsSep);
 
         if ($symbol !== null) {
-            // FIXME: should be a parameter related to i18n configuration
             $number = $number . ' ' . $symbol;
         }
 
diff --git a/core/lib/Thelia/Tools/Redirect.php b/core/lib/Thelia/Tools/Redirect.php
index 23fd9258b..817cc6f33 100644
--- a/core/lib/Thelia/Tools/Redirect.php
+++ b/core/lib/Thelia/Tools/Redirect.php
@@ -35,7 +35,5 @@ class Redirect
 
             $response->send();
         }
-
-        exit;
     }
 }